1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67
|
--- a/src/Makefiles/Makefile_linux_shared
+++ b/src/Makefiles/Makefile_linux_shared
@@ -79,14 +79,14 @@ WARN_FLAGS = \
-Wno-unused \
-Wno-unknown-pragmas \
-Wno-long-long \
- -Wno-format
COMPILE_FLAGS = -fPIC -O3 -flto -fopenmp -mtune=generic -std=c++11 \
$(WARN_FLAGS) \
$(DDS_BEHAVIOR) $(THREAD_COMPILE) $(THREADING)
DLLBASE = dds
-SHARED_LIB = lib$(DLLBASE).so
+SOVERSION = 0
+SHARED_LIB = lib$(DLLBASE).so.$(SOVERSION)
include $(INCL_SOURCE)
@@ -99,16 +99,17 @@ LINK_FLAGS = \
-Wl,--as-needed \
-Wl,-z \
-Wl,relro \
+ -Wl,-soname,$(SHARED_LIB) \
$(THREAD_LINK) \
-fPIC
linux: $(O_FILES)
$(CC) \
- -o $(SHARED_LIB) $(O_FILES) $(LINK_FLAGS)
+ -o $(SHARED_LIB) $(O_FILES) $(LDFLAGS) $(LINK_FLAGS)
%.o: %.cpp
- $(CC) $(COMPILE_FLAGS) -c $<
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(COMPILE_FLAGS) -c $<
depend:
makedepend -Y -- $(SOURCE_FILES)
--- a/examples/Makefiles/Makefile_linux
+++ b/examples/Makefiles/Makefile_linux
@@ -8,7 +8,7 @@
# If your compiler name is not given here, change it.
CC = g++
-CC_FLAGS = -O3 -flto -mtune=generic -fopenmp
+CC_FLAGS = $(CPPFLAGS) $(CFLAGS) -O3 -flto -mtune=generic -fopenmp
# These flags are not turned on by default, but DDS should pass them.
# Turn them on below.
@@ -35,7 +35,6 @@ WARN_FLAGS = \
-Wno-unused \
-Wno-unknown-pragmas \
-Wno-long-long \
- -Wno-format
# Here you can turn on warnings.
# CC_FULL_FLAGS = $(CC_FLAGS)
@@ -64,7 +63,7 @@ ALL_EXAMPLE_FILES = \
LIB_FLAGS = -L. -l$(DLLBASE)
-LD_FLAGS =
+LD_FLAGS = $(LDFLAGS)
OBJ_FILES = $(subst .cpp,.o,$(COMMON_SOURCE_FILES))
EX_OBJ_FILES = $(subst .cpp,.o,$(ALL_EXAMPLE_FILES))
|