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
|
Description: Add CPPFLAGS and LDFLAGS to Makefile.in
To allow the Debian build environment control over build options, we need to
allow CPPFLAG, CXXFLAGS, and LDFLAGS to flow through.
Author: Stephen Dennis <brazilofmux@gmail.com>
Applied-Upstream: bd9a7a3a6a76010a88b2747b51f814f249d4b163
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: tinymux-2.10.1.13/src/Makefile.in
===================================================================
--- tinymux-2.10.1.13.orig/src/Makefile.in 2017-01-01 17:52:43.909496242 -0700
+++ tinymux-2.10.1.13/src/Makefile.in 2017-01-01 18:11:22.629104653 -0700
@@ -163,7 +163,7 @@
# Auxiliary source files: only used by offline utilities.
#
AUX_SRC = unsplit.cpp
-ALLCXXFLAGS = $(CXXFLAGS) $(OPTIM) $(DEFS) $(MEMORY_BASED) $(WOD_REALMS) \
+ALLCXXFLAGS = $(CXXFLAGS) $(CPPFLAGS) $(OPTIM) $(DEFS) $(MEMORY_BASED) $(WOD_REALMS) \
$(REALITY_LVLS) $(STUB_SLAVE) $(FIRANMUX) $(DEPRECATED) $(SELFCHECK) \
$(INLINESQL) $(INLINESQL_INCLUDE) $(SSL)
@@ -186,22 +186,22 @@
( if [ ! -z "@DYNAMICLIB_TARGET@" -a -f "@DYNAMICLIB_TARGET@" ]; then cd ../game/bin ; rm -f @DYNAMICLIB_TARGET@; ln -s ../../src/@DYNAMICLIB_TARGET@ @DYNAMICLIB_TARGET@ ; fi )
stubslave: stubslave.o
- $(CXX) $(ALLCXXFLAGS) -o stubslave stubslave.o $(LDFLAGS) -L. $(LIBS) $(MUX_LIBS) $(STUBLIBS)
+ $(CXX) $(ALLCXXFLAGS) $(LDFLAGS) -o stubslave stubslave.o -L. $(LIBS) $(MUX_LIBS) $(STUBLIBS)
slave: slave.o
- $(CXX) $(ALLCXXFLAGS) -o slave slave.o $(LIBS)
+ $(CXX) $(ALLCXXFLAGS) $(LDFLAGS) -o slave slave.o $(LIBS)
unsplit: unsplit.o
- $(CXX) $(ALLCXXFLAGS) -o unsplit unsplit.o
+ $(CXX) $(ALLCXXFLAGS) $(LDFLAGS) -o unsplit unsplit.o
netmux: $(NETMUX_OBJ) $(VER_SRC)
$(CXX) $(ALLCXXFLAGS) $(VER_FLG) -c $(VER_SRC)
( if [ -f netmux ]; then mv -f netmux netmux~ ; fi )
- $(CXX) $(ALLCXXFLAGS) -o netmux $(NETMUX_OBJ) $(VER_OBJ) $(LDFLAGS) -L. $(LIBS) $(INLINESQL_LIBS) $(SSL_LIBS) $(MUX_LIBS)
+ $(CXX) $(ALLCXXFLAGS) $(LDFLAGS) -o netmux $(NETMUX_OBJ) $(VER_OBJ) -L. $(LIBS) $(INLINESQL_LIBS) $(SSL_LIBS) $(MUX_LIBS)
@DYNAMICLIB_TARGET@: $(LIBMUX_BASE_SRC)
( if [ -f @DYNAMICLIB_TARGET@ ]; then mv -f @DYNAMICLIB_TARGET@ @DYNAMICLIB_TARGET@~ ; fi )
- $(CXX) $(ALLCXXFLAGS) @DYNAMICLIB_CPPFLAGS@ -o @DYNAMICLIB_TARGET@ $(LIBMUX_BASE_SRC) $(LIBS) $(DL_LIB) $(INLINESQL_LIBS) $(SSL_LIBS)
+ $(CXX) $(ALLCXXFLAGS) @DYNAMICLIB_CPPFLAGS@ $(LDFLAGS) -o @DYNAMICLIB_TARGET@ $(LIBMUX_BASE_SRC) $(LIBS) $(DL_LIB) $(INLINESQL_LIBS) $(SSL_LIBS)
depend: $(ALLSRC) unsplit
for i in $(ALLSRC) slave.cpp stubslave.cpp ; do $(CXXCPP) $(ALLCXXFLAGS) -M $$i; done | sed -e 's:/usr[^ ]*[ ]*::g' | ./unsplit > .depend~
|
