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
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
|
Author: Roberto C. Sanchez <roberto@connexer.com>
Description: Don't clobber user variables (e.g., INCLUDES, CXXFLAGS, LDFLAGS, etc.) from within automake.
--- quickfix.git.orig/examples/executor/C++/Makefile.am
+++ quickfix.git/examples/executor/C++/Makefile.am
@@ -7,7 +7,7 @@
executor_LDADD = $(top_builddir)/src/C++/libquickfix.la
-INCLUDES = -I$(top_builddir)/include
+AM_CPPFLAGS = -I$(top_builddir)/include
all-local:
rm -f ../../../bin/executor
--- quickfix.git.orig/examples/ordermatch/Makefile.am
+++ quickfix.git/examples/ordermatch/Makefile.am
@@ -18,7 +18,7 @@
ordermatch_LDADD = $(top_builddir)/src/C++/libquickfix.la
-INCLUDES = -I$(top_builddir)/include
+AM_CPPFLAGS = -I$(top_builddir)/include
all-local:
rm -f ../../bin/ordermatch
--- quickfix.git.orig/examples/ordermatch/test/Makefile.am
+++ quickfix.git/examples/ordermatch/test/Makefile.am
@@ -1,5 +1,5 @@
-CFLAGS += -O0 -g
-CXXFLAGS += -O0 -g
+AM_CFLAGS = -O0 -g
+AM_CXXFLAGS = -O0 -g
noinst_PROGRAMS = ordermatch_ut
@@ -10,5 +10,5 @@
ordermatch_ut_LDADD = -L$(top_builddir)/src/C++ -lquickfix
-INCLUDES = -I$(top_builddir)/include -I.. -I../../../UnitTest++/src
-LDFLAGS = -L../../../UnitTest++ -lUnitTest++
\ No newline at end of file
+AM_CPPFLAGS = -I$(top_builddir)/include -I.. -I../../../UnitTest++/src
+AM_LDFLAGS = -L../../../UnitTest++ -lUnitTest++
--- quickfix.git.orig/examples/tradeclient/Makefile.am
+++ quickfix.git/examples/tradeclient/Makefile.am
@@ -7,7 +7,7 @@
tradeclient_LDADD = $(top_builddir)/src/C++/libquickfix.la
-INCLUDES = -I$(top_builddir)/include -I..
+AM_CPPFLAGS = -I$(top_builddir)/include -I..
all-local:
rm -f ../../bin/tradeclient
--- quickfix.git.orig/src/C++/Makefile.am
+++ quickfix.git/src/C++/Makefile.am
@@ -197,4 +197,4 @@
libquickfix_la_LDFLAGS = -version-info 17:0:0
-INCLUDES =-I. -I.. -I../..
+AM_CPPFLAGS =-I. -I.. -I../..
--- quickfix.git.orig/src/C++/test/Makefile.am
+++ quickfix.git/src/C++/test/Makefile.am
@@ -1,5 +1,5 @@
-CFLAGS += -O0 -g
-CXXFLAGS += -O0 -g
+AM_CFLAGS = -O0 -g
+AM_CXXFLAGS = -O0 -g
noinst_LTLIBRARIES = libquickfixcpptest.la
@@ -38,4 +38,4 @@
UtcTimeOnlyTestCase.cpp \
UtcTimeStampTestCase.cpp
-INCLUDES = -I.. -I../../../UnitTest++/src
+AM_CPPFLAGS = -I.. -I../../../UnitTest++/src
--- quickfix.git.orig/src/Makefile.am
+++ quickfix.git/src/Makefile.am
@@ -28,8 +28,8 @@
ut_LDADD = C++/test/libquickfixcpptest.la C++/libquickfix.la
pt_LDADD = C++/libquickfix.la
-INCLUDES =-IC++ -IC++/test -I../UnitTest++/src
-LDFLAGS =-L../UnitTest++ -lUnitTest++
+AM_CPPFLAGS =-IC++ -IC++/test -I../UnitTest++/src
+AM_LDFLAGS =-L../UnitTest++ -lUnitTest++
all-local:
rm -f ../test/ut ../test/pt ../test/at ../test/ut_debug
--- quickfix.git.orig/src/python2/Makefile.am
+++ quickfix.git/src/python2/Makefile.am
@@ -9,7 +9,7 @@
_quickfix_la_LDFLAGS = -version-info 13:0:0 -module
_quickfix_la_LIBADD = $(top_builddir)/src/C++/libquickfix.la
-INCLUDES = $(PYTHON2_CFLAGS) -I. -I.. -I../.. -I../C++
+AM_CPPFLAGS = $(PYTHON2_CFLAGS) -I. -I.. -I../.. -I../C++
local_python_src=$(top_builddir)/src/python2
local_python_lib=$(top_builddir)/lib/python2
--- quickfix.git.orig/src/python3/Makefile.am
+++ quickfix.git/src/python3/Makefile.am
@@ -9,7 +9,7 @@
_quickfix_la_LDFLAGS = -version-info 13:0:0 -module
_quickfix_la_LIBADD = $(top_builddir)/src/C++/libquickfix.la
-INCLUDES = $(PYTHON3_CFLAGS) -I. -I.. -I../.. -I../C++
+AM_CPPFLAGS = $(PYTHON3_CFLAGS) -I. -I.. -I../.. -I../C++
local_python_src=$(top_builddir)/src/python3
local_python_lib=$(top_builddir)/lib/python3
--- quickfix.git.orig/src/ruby/Makefile.am
+++ quickfix.git/src/ruby/Makefile.am
@@ -1,6 +1,6 @@
pkgdata_DATA = quickfix_ruby.rb quickfix_fields.rb quickfix40.rb quickfix41.rb quickfix42.rb quickfix43.rb quickfix44.rb quickfix50.rb quickfix50sp1.rb quickfix50sp2.rb quickfixt11.rb
-INCLUDES =-I. -I.. -I../.. -I../C++
+AM_CPPFLAGS =-I. -I.. -I../.. -I../C++
local_ruby_src=$(top_builddir)/src/ruby
local_ruby_lib=$(top_builddir)/lib/ruby
|
