Codebase list dds / 71195eb
Pass CFLAGS to examples Makefile as well. Christoph Berg 5 years ago
3 changed file(s) with 42 addition(s) and 5 deletion(s). Raw diff Collapse all Expand all
0 dds (2.9.0-6) UNRELEASED; urgency=medium
1
2 * Pass CFLAGS to examples Makefile as well.
3
4 -- Christoph Berg <myon@debian.org> Mon, 22 Oct 2018 22:05:08 +0200
5
06 dds (2.9.0-5) unstable; urgency=medium
17
28 * Move libdds0 to Section: libs. Closes: #909774.
1616
1717 include $(INCL_SOURCE)
1818
19 @@ -99,6 +99,7 @@ LINK_FLAGS = \
19 @@ -99,16 +99,17 @@ LINK_FLAGS = \
2020 -Wl,--as-needed \
2121 -Wl,-z \
2222 -Wl,relro \
2424 $(THREAD_LINK) \
2525 -fPIC
2626
27 @@ -108,7 +109,7 @@ linux: $(O_FILES)
28 -o $(SHARED_LIB) $(O_FILES) $(LINK_FLAGS)
27
28 linux: $(O_FILES)
29 $(CC) \
30 - -o $(SHARED_LIB) $(O_FILES) $(LINK_FLAGS)
31 + -o $(SHARED_LIB) $(O_FILES) $(LDFLAGS) $(LINK_FLAGS)
2932
3033 %.o: %.cpp
3134 - $(CC) $(COMPILE_FLAGS) -c $<
3336
3437 depend:
3538 makedepend -Y -- $(SOURCE_FILES)
39 --- a/examples/Makefiles/Makefile_linux
40 +++ b/examples/Makefiles/Makefile_linux
41 @@ -8,7 +8,7 @@
42 # If your compiler name is not given here, change it.
43 CC = g++
44
45 -CC_FLAGS = -O3 -flto -mtune=generic -fopenmp
46 +CC_FLAGS = $(CFLAGS) -O3 -flto -mtune=generic -fopenmp
47
48 # These flags are not turned on by default, but DDS should pass them.
49 # Turn them on below.
50 @@ -35,7 +35,6 @@ WARN_FLAGS = \
51 -Wno-unused \
52 -Wno-unknown-pragmas \
53 -Wno-long-long \
54 - -Wno-format
55
56 # Here you can turn on warnings.
57 # CC_FULL_FLAGS = $(CC_FLAGS)
58 @@ -64,7 +63,7 @@ ALL_EXAMPLE_FILES = \
59
60 LIB_FLAGS = -L. -l$(DLLBASE)
61
62 -LD_FLAGS =
63 +LD_FLAGS = $(LDFLAGS)
64
65 OBJ_FILES = $(subst .cpp,.o,$(COMMON_SOURCE_FILES))
66 EX_OBJ_FILES = $(subst .cpp,.o,$(ALL_EXAMPLE_FILES))
33 # If your compiler name is not given here, change it.
44 CC = g++
55
6 -CC_FLAGS = -O3 -flto -mtune=generic -fopenmp
7 +CC_FLAGS = -O3 -flto -fopenmp
6 -CC_FLAGS = $(CFLAGS) -O3 -flto -mtune=generic -fopenmp
7 +CC_FLAGS = $(CFLAGS) -O3 -flto -fopenmp
88
99 # These flags are not turned on by default, but DDS should pass them.
1010 # Turn them on below.