Fixed cflags

PDXostc · Jun 28, 2019 · cdcc815 · cdcc815
2 parents 85b2282 + f8c83e0
commit cdcc815
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 42 deletions.
diff --git a/Makefile b/Makefile
@@ -13,9 +13,9 @@ LIB_TARGET=libdstc.a
 LIB_SO_TARGET=libdstc.so
 
 INCLUDES=-I/usr/local/include
-CFLAGSLIST=-pthread -fPIC -ggdb $(INCLUDES) -Wall $(CFLAGS) $(CPPFLAGS) -D_GNU_SOURCE #-DDSTC_PTHREAD_DEBUG
+CFLAGS ?=-fPIC -g $(INCLUDES) -Wall -pthread -D_GNU_SOURCE #-DDSTC_PTHREAD_DEBUG
+
 DESTDIR ?= /usr/local
-export CFLAGSLIST
 export DESTDIR
 
 #
@@ -27,7 +27,7 @@ all: $(LIB_TARGET) $(LIB_SO_TARGET) $(OBJ)
 #	Make sure all of the object files are current.
 #
 $(OBJ): $(SRC) $(HDR)
-	$(CC) $(CFLAGSLIST) -c $(SRC)
+	$(CC) $(CFLAGS) -c $(SRC)
 
 #
 #	Rebuild the static target library.
@@ -39,7 +39,7 @@ $(LIB_TARGET): $(OBJ)
 #	Rebuild the shared object target library.b
 #
 $(LIB_SO_TARGET):  $(OBJ)
-	$(CC) -shared $(CFLAGSLIST) $(OBJ) -o $(LIB_SO_TARGET)
+	$(CC) -shared $(CFLAGS) $(OBJ) -o $(LIB_SO_TARGET)
 
 #
 #	Remove all the generated files in this project.  Note that this does NOT

diff --git a/examples/callback/Makefile b/examples/callback/Makefile
@@ -37,11 +37,11 @@ all: $(TARGET_SERVER) $(TARGET_CLIENT)
 nomacro:  $(TARGET_NOMACRO_SERVER) $(TARGET_NOMACRO_CLIENT)
 
 $(TARGET_SERVER): $(SERVER_OBJ)
-	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@
+	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 
 $(TARGET_CLIENT): $(CLIENT_OBJ)
-	$(CC) $(CFLAGS)  $^ -L../.. -ldstc -lrmc -o $@
+	$(CC) $(CFLAGS)  $^ -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 
 # Recompile everything if dstc.h changes
@@ -66,10 +66,10 @@ uninstall:
 # The client is built as a regular binary
 #
 $(TARGET_NOMACRO_CLIENT) : $(CLIENT_NOMACRO_OBJ) $(DSTC_LIB)
-	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@
+	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 $(TARGET_NOMACRO_SERVER): $(SERVER_NOMACRO_OBJ) $(DSTC_LIB)
-	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@
+	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 
 $(CLIENT_NOMACRO_SOURCE): ${CLIENT_SOURCE} ../../dstc.h

diff --git a/examples/callback_dyndata/Makefile b/examples/callback_dyndata/Makefile
@@ -37,11 +37,11 @@ all: $(TARGET_SERVER) $(TARGET_CLIENT)
 nomacro:  $(TARGET_NOMACRO_SERVER) $(TARGET_NOMACRO_CLIENT)
 
 $(TARGET_SERVER): $(SERVER_OBJ)
-	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@
+	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 
 $(TARGET_CLIENT): $(CLIENT_OBJ)
-	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@
+	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 
 # Recompile everything if dstc.h changes
@@ -66,10 +66,10 @@ uninstall:
 # The client is built as a regular binary
 #
 $(TARGET_NOMACRO_CLIENT) : $(CLIENT_NOMACRO_OBJ) $(DSTC_LIB)
-	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@
+	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 $(TARGET_NOMACRO_SERVER): $(SERVER_NOMACRO_OBJ) $(DSTC_LIB)
-	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@
+	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 
 $(CLIENT_NOMACRO_SOURCE): ${CLIENT_SOURCE} ../../dstc.h

diff --git a/examples/chat/Makefile b/examples/chat/Makefile
@@ -30,7 +30,7 @@ nomacro:  $(TARGET_NOMACRO)
 # The client is built as a regular binary
 #
 $(TARGET): $(OBJ)
-	$(CC)  $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@
+	$(CC)  $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 #
 # Recompile everything if dstc.h changes
@@ -54,7 +54,7 @@ uninstall:
 # The client is built as a regular binary
 #
 $(TARGET_NOMACRO): $(NOMACRO_OBJ)
-	$(CC) $(CFLAGS) -L../.. -ldstc -lrmc $^ -o $@
+	$(CC) $(CFLAGS) -L../.. -ldstc -lrmc $^ -o $@ $(LDFLAGS)
 
 
 $(NOMACRO_SOURCE): ${SOURCE} ../../dstc.h

diff --git a/examples/cpp/Makefile b/examples/cpp/Makefile
@@ -54,14 +54,14 @@ all: $(TARGET_C_CLIENT) $(TARGET_SERVER) $(TARGET_CLIENT)
 nomacro:  $(TARGET_NOMACRO_SERVER) $(TARGET_NOMACRO_CLIENT) $(TARGET_NOMACRO_C_CLIENT)
 
 $(TARGET_SERVER): $(SERVER_OBJ)
-	$(CXX) $(CXXFLAGS) $^ -L../.. -ldstc -lrmc -o $@
+	$(CXX) $(CXXFLAGS) $^ -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 
 $(TARGET_C_CLIENT): $(C_CLIENT_OBJ)
-	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@
+	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 $(TARGET_CLIENT): $(CLIENT_OBJ)
-	$(CXX) $(CXXFLAGS) $^ -L../.. -ldstc -lrmc -o $@
+	$(CXX) $(CXXFLAGS) $^ -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 
 # Recompile everything if dstc.h changes
@@ -89,13 +89,13 @@ uninstall:
 # The client is built as a regular binary
 #
 $(TARGET_NOMACRO_CLIENT) : $(CLIENT_NOMACRO_OBJ) $(DSTC_LIB)
-	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@
+	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 $(TARGET_NOMACRO_C_CLIENT) : $(C_CLIENT_NOMACRO_OBJ) $(DSTC_LIB)
-	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@
+	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 $(TARGET_NOMACRO_SERVER): $(SERVER_NOMACRO_OBJ) $(DSTC_LIB)
-	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@
+	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 
 $(CLIENT_NOMACRO_SOURCE): ${CLIENT_SOURCE} ../../dstc.h

diff --git a/examples/dynamic_data/Makefile b/examples/dynamic_data/Makefile
@@ -37,11 +37,11 @@ all: $(TARGET_SERVER) $(TARGET_CLIENT)
 nomacro:  $(TARGET_NOMACRO_SERVER) $(TARGET_NOMACRO_CLIENT)
 
 $(TARGET_SERVER): $(SERVER_OBJ)
-	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@
+	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 
 $(TARGET_CLIENT): $(CLIENT_OBJ)
-	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@
+	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 
 # Recompile everything if dstc.h changes
@@ -66,10 +66,10 @@ uninstall:
 # The client is built as a regular binary
 #
 $(TARGET_NOMACRO_CLIENT) : $(CLIENT_NOMACRO_OBJ) $(DSTC_LIB)
-	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@
+	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 $(TARGET_NOMACRO_SERVER): $(SERVER_NOMACRO_OBJ) $(DSTC_LIB)
-	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@
+	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 
 $(CLIENT_NOMACRO_SOURCE): ${CLIENT_SOURCE} ../../dstc.h

diff --git a/examples/loopback/Makefile b/examples/loopback/Makefile
@@ -25,7 +25,7 @@ all: $(TARGET)
 nomacro:  $(TARGET_NOMACRO)
 
 $(TARGET): $(OBJ)
-	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@
+	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 
 # Recompile everything if dstc.h changes
@@ -48,7 +48,7 @@ uninstall:
 # The client is built as a regular binary
 #
 $(TARGET_NOMACRO) : $(NOMACRO_OBJ) $(DSTC_LIB)
-	$(CC)  $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@
+	$(CC)  $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 
 $(NOMACRO_SOURCE): ${SOURCE} ../../dstc.h

diff --git a/examples/print_name_and_age/Makefile b/examples/print_name_and_age/Makefile
@@ -37,11 +37,11 @@ all: $(TARGET_SERVER) $(TARGET_CLIENT)
 nomacro:  $(TARGET_NOMACRO_SERVER) $(TARGET_NOMACRO_CLIENT)
 
 $(TARGET_SERVER): $(SERVER_OBJ)
-	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@
+	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 
 $(TARGET_CLIENT): $(CLIENT_OBJ)
-	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@
+	$(CC) $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 
 # Recompile everything if dstc.h changes
@@ -66,10 +66,10 @@ uninstall:
 # The client is built as a regular binary
 #
 $(TARGET_NOMACRO_CLIENT) : $(CLIENT_NOMACRO_OBJ) $(DSTC_LIB)
-	$(CC)  $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@
+	$(CC)  $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 $(TARGET_NOMACRO_SERVER): $(SERVER_NOMACRO_OBJ) $(DSTC_LIB)
-	$(CC)  $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@
+	$(CC)  $(CFLAGS) $^ -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 
 $(CLIENT_NOMACRO_SOURCE): ${CLIENT_SOURCE} ../../dstc.h

diff --git a/examples/print_struct/Makefile b/examples/print_struct/Makefile
@@ -36,11 +36,11 @@ all: $(TARGET_SERVER) $(TARGET_CLIENT)
 
 nomacro:  $(TARGET_NOMACRO_SERVER) $(TARGET_NOMACRO_CLIENT)
 $(TARGET_SERVER): $(SERVER_OBJ)
-	$(CC) $(CFLAGS) $(LIBPATH) $^ -L../.. -ldstc -lrmc -o $@
+	$(CC) $(CFLAGS) $(LIBPATH) $^ -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 
 $(TARGET_CLIENT): $(CLIENT_OBJ)
-	$(CC) $(CFLAGS) $(LIBPATH) $^ -L../.. -ldstc -lrmc -o $@
+	$(CC) $(CFLAGS) $(LIBPATH) $^ -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 
 # Recompile everything if dstc.h changes
@@ -65,10 +65,10 @@ uninstall:
 # The client is built as a regular binary
 #
 $(TARGET_NOMACRO_CLIENT) : $(CLIENT_NOMACRO_OBJ) $(DSTC_LIB)
-	$(CC) $(CFLAGS) $(LIBPATH) $^ -L../.. -ldstc -lrmc -o $@
+	$(CC) $(CFLAGS) $(LIBPATH) $^ -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 $(TARGET_NOMACRO_SERVER): $(SERVER_NOMACRO_OBJ) $(DSTC_LIB)
-	$(CC) $(CFLAGS) $(LIBPATH) $^ -L../.. -ldstc -lrmc -o $@
+	$(CC) $(CFLAGS) $(LIBPATH) $^ -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 
 $(CLIENT_NOMACRO_SOURCE): ${CLIENT_SOURCE} ../../dstc.h

diff --git a/examples/stress/Makefile b/examples/stress/Makefile
@@ -37,11 +37,11 @@ all: $(TARGET_SERVER) $(TARGET_CLIENT)
 nomacro:  $(TARGET_NOMACRO_SERVER) $(TARGET_NOMACRO_CLIENT)
 
 $(TARGET_SERVER): $(SERVER_OBJ)
-	$(CC) $(CFLAGS) $(SERVER_OBJ) -L../.. -ldstc -lrmc -o $@
+	$(CC) $(CFLAGS) $(SERVER_OBJ) -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 
 $(TARGET_CLIENT): $(CLIENT_OBJ)
-	$(CC) $(CFLAGS) $(CLIENT_OBJ) -L../.. -ldstc -lrmc -o $@
+	$(CC) $(CFLAGS) $(CLIENT_OBJ) -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 
 # Recompile everything if dstc.h changes
@@ -67,10 +67,10 @@ uninstall:
 # The client is built as a regular binary
 #
 $(TARGET_NOMACRO_CLIENT) : $(CLIENT_NOMACRO_OBJ) $(DSTC_LIB)
-	$(CC) $(CFLAGS) $(LIBPATH) $^ -L../.. -ldstc -lrmc -o $@
+	$(CC) $(CFLAGS) $(LIBPATH) $^ -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 $(TARGET_NOMACRO_SERVER): $(SERVER_NOMACRO_OBJ) $(DSTC_LIB)
-	$(CC) $(CFLAGS) $(LIBPATH) $^ -L../.. -ldstc -lrmc -o $@
+	$(CC) $(CFLAGS) $(LIBPATH) $^ -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 
 $(CLIENT_NOMACRO_SOURCE): ${CLIENT_SOURCE} ../../dstc.h

diff --git a/examples/thread_stress/Makefile b/examples/thread_stress/Makefile
@@ -37,11 +37,11 @@ all: $(TARGET_SERVER) $(TARGET_CLIENT)
 nomacro:  $(TARGET_NOMACRO_SERVER) $(TARGET_NOMACRO_CLIENT)
 
 $(TARGET_SERVER): $(SERVER_OBJ)
-	$(CC) $(CFLAGS) $(SERVER_OBJ) -L../.. -ldstc -lrmc -o $@
+	$(CC) $(CFLAGS) $(SERVER_OBJ) -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 
 $(TARGET_CLIENT): $(CLIENT_OBJ)
-	$(CC) $(CFLAGS) $(CLIENT_OBJ) -L../.. -ldstc -lrmc -o $@
+	$(CC) $(CFLAGS) $(CLIENT_OBJ) -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 
 # Recompile everything if dstc.h changes
@@ -67,10 +67,10 @@ uninstall:
 # The client is built as a regular binary
 #
 $(TARGET_NOMACRO_CLIENT) : $(CLIENT_NOMACRO_OBJ) $(DSTC_LIB)
-	$(CC) $(CFLAGS) $(LIBPATH) $^ -L../.. -ldstc -lrmc -o $@
+	$(CC) $(CFLAGS) $(LIBPATH) $^ -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 $(TARGET_NOMACRO_SERVER): $(SERVER_NOMACRO_OBJ) $(DSTC_LIB)
-	$(CC) $(CFLAGS) $(LIBPATH) $^ -L../.. -ldstc -lrmc -o $@
+	$(CC) $(CFLAGS) $(LIBPATH) $^ -L../.. -ldstc -lrmc -o $@ $(LDFLAGS)
 
 
 $(CLIENT_NOMACRO_SOURCE): ${CLIENT_SOURCE} ../../dstc.h