renamed Makefile references to TCLAP to HELPERS; do not install Optio…

…ns.h or optionsparser.h
danomatika · Jul 31, 2016 · 5caf4ac · 5caf4ac
1 parent 4e21577
commit 5caf4ac
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 16 deletions.
diff --git a/lib/Makefile.am b/lib/Makefile.am
@@ -8,11 +8,10 @@ SUBDIRS = $(LIB_SUBDIRS)
 # make sure libs are included in the dist tarball
 DIST_SUBDIRS = lopack tinyobject
 
-# tclap commandline parser
-
 # libs sources, headers here because we dont want to install them
 noinst_HEADERS = cpphelpers/Log.h \
 				 cpphelpers/Path.h \
+				 cpphelpers/optionparser.h cpphelpers/Options.h \
 				 cpphelpers/tclap/tclap.h \
 				 cpphelpers/tclap/CommandLine.h \
 				 cpphelpers/tclap/tclap/Arg.h \

diff --git a/lib/Makefile.in b/lib/Makefile.in
@@ -338,8 +338,8 @@ LIB_SUBDIRS = $(am__append_1) $(am__append_2)
 @LOCAL_TINYOBJECT_FALSE@TINYOBJECT_LIBS = -ltinyobject
 @LOCAL_TINYOBJECT_TRUE@TINYOBJECT_LIBS = -L$(top_builddir)/lib/tinyobject/src/tinyobject -ltinyobject
 
-# tclap
-TCLAP_INCLUDE = -I$(top_srcdir)/lib/cpphelpers -I$(top_srcdir)/lib/cpphelpers/tclap
+# cpphelpers
+HELPERS_INCLUDE = -I$(top_srcdir)/lib/cpphelpers
 
 # load externals variables
 
@@ -349,11 +349,10 @@ SUBDIRS = $(LIB_SUBDIRS)
 # make sure libs are included in the dist tarball
 DIST_SUBDIRS = lopack tinyobject
 
-# tclap commandline parser
-
 # libs sources, headers here because we dont want to install them
 noinst_HEADERS = cpphelpers/Log.h \
 				 cpphelpers/Path.h \
+				 cpphelpers/optionparser.h cpphelpers/Options.h \
 				 cpphelpers/tclap/tclap.h \
 				 cpphelpers/tclap/CommandLine.h \
 				 cpphelpers/tclap/tclap/Arg.h \

diff --git a/lib/libs.mk b/lib/libs.mk
@@ -26,5 +26,5 @@ TINYOBJECT_INCLUDE =
 TINYOBJECT_LIBS = -ltinyobject
 endif
 
-# tclap
-TCLAP_INCLUDE = -I$(top_srcdir)/lib/cpphelpers -I$(top_srcdir)/lib/cpphelpers/tclap
+# cpphelpers
+HELPERS_INCLUDE = -I$(top_srcdir)/lib/cpphelpers
diff --git a/src/joyosc/Makefile.am b/src/joyosc/Makefile.am
@@ -19,7 +19,7 @@ joyosc_SOURCES = main.cpp Common.h App.h App.cpp Config.h Config.cpp \
 AM_CPPFLAGS = $(SDL_CFLAGS) \
 			  $(LO_CFLAGS) $(LOPACK_INCLUDE) \
 			  $(TINYXML2_CFLAGS) $(TINYOBJECT_INCLUDE) \
-			  $(TCLAP_INCLUDE)
+			  $(HELPERS_INCLUDE)
 
 # libs to link
 AM_LDFLAGS = $(SDL_LIBS) \

diff --git a/src/joyosc/Makefile.in b/src/joyosc/Makefile.in
@@ -350,8 +350,8 @@ LIB_SUBDIRS = $(am__append_1) $(am__append_2)
 @LOCAL_TINYOBJECT_FALSE@TINYOBJECT_LIBS = -ltinyobject
 @LOCAL_TINYOBJECT_TRUE@TINYOBJECT_LIBS = -L$(top_builddir)/lib/tinyobject/src/tinyobject -ltinyobject
 
-# tclap
-TCLAP_INCLUDE = -I$(top_srcdir)/lib/cpphelpers -I$(top_srcdir)/lib/cpphelpers/tclap
+# cpphelpers
+HELPERS_INCLUDE = -I$(top_srcdir)/lib/cpphelpers
 
 # program's sources
 joyosc_SOURCES = main.cpp Common.h App.h App.cpp Config.h Config.cpp \
@@ -368,7 +368,7 @@ joyosc_SOURCES = main.cpp Common.h App.h App.cpp Config.h Config.cpp \
 AM_CPPFLAGS = $(SDL_CFLAGS) \
 			  $(LO_CFLAGS) $(LOPACK_INCLUDE) \
 			  $(TINYXML2_CFLAGS) $(TINYOBJECT_INCLUDE) \
-			  $(TCLAP_INCLUDE)
+			  $(HELPERS_INCLUDE)
 
 
 # libs to link

diff --git a/src/lsjs/Makefile.am b/src/lsjs/Makefile.am
@@ -9,7 +9,7 @@ bin_PROGRAMS = lsjs
 lsjs_SOURCES = main.cpp
 
 # include paths
-AM_CPPFLAGS = $(SDL_CFLAGS) $(TCLAP_INCLUDE)
+AM_CPPFLAGS = $(SDL_CFLAGS) $(HELPERS_INCLUDE)
 
 # libs to link
 AM_LDFLAGS = $(SDL_LIBS)
diff --git a/src/lsjs/Makefile.in b/src/lsjs/Makefile.in
@@ -328,14 +328,14 @@ LIB_SUBDIRS = $(am__append_1) $(am__append_2)
 @LOCAL_TINYOBJECT_FALSE@TINYOBJECT_LIBS = -ltinyobject
 @LOCAL_TINYOBJECT_TRUE@TINYOBJECT_LIBS = -L$(top_builddir)/lib/tinyobject/src/tinyobject -ltinyobject
 
-# tclap
-TCLAP_INCLUDE = -I$(top_srcdir)/lib/cpphelpers -I$(top_srcdir)/lib/cpphelpers/tclap
+# cpphelpers
+HELPERS_INCLUDE = -I$(top_srcdir)/lib/cpphelpers
 
 # program's sources
 lsjs_SOURCES = main.cpp
 
 # include paths
-AM_CPPFLAGS = $(SDL_CFLAGS) $(TCLAP_INCLUDE)
+AM_CPPFLAGS = $(SDL_CFLAGS) $(HELPERS_INCLUDE)
 
 # libs to link
 AM_LDFLAGS = $(SDL_LIBS)