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
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
|
--- gogoc-pal/Makefile.orig 2010-03-07 17:38:30.000000000 +0100
+++ gogoc-pal/Makefile 2010-11-19 19:40:21.000000000 +0100
@@ -27,11 +27,10 @@
PLATFORM :=$(shell [ -z "$(platform)" ] && uname | tr "[A-Z]" "[a-z]" || echo "$(platform)" )
SUPPORTED_PLATFORMS=linux netbsd freebsd openbsd darwin sunos gogocpe
-CC=gcc
+CC?=gcc
-
# Export these variables to sub-makes.
-export PLATFORM PLATFORM_DIR OBJS_DIR DEFS_DIR OUT_INC_DIR CC DEBUG
+export PLATFORM PLATFORM_DIR OBJS_DIR DEFS_DIR OUT_INC_DIR DEBUG
#
--- gogoc-tsp/src/lib/Makefile.orig 2009-11-20 17:53:36.000000000 +0100
+++ gogoc-tsp/src/lib/Makefile 2010-11-19 19:42:39.000000000 +0100
@@ -14,11 +14,11 @@
ifdef DEBUG
-CFLAGS=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
+CFLAGS+=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
else
-CFLAGS=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
+CFLAGS+=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
endif
-CC=gcc
+CC?=gcc
OBJS=$(OBJS_DIR)/base64.o \
$(OBJS_DIR)/cli.o \
--- gogoc-tsp/src/net/Makefile.orig 2009-11-20 17:53:38.000000000 +0100
+++ gogoc-tsp/src/net/Makefile 2010-11-19 19:43:55.000000000 +0100
@@ -14,11 +14,11 @@
ifdef DEBUG
-CFLAGS=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
+CFLAGS+=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
else
-CFLAGS=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
+CFLAGS+=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
endif
-CC=gcc
+CC?=gcc
OBJS=$(OBJS_DIR)/net.o \
$(OBJS_DIR)/net_rudp.o \
--- gogoc-tsp/src/tsp/Makefile.orig 2009-11-20 17:53:40.000000000 +0100
+++ gogoc-tsp/src/tsp/Makefile 2010-11-19 19:50:22.000000000 +0100
@@ -14,11 +14,11 @@
ifdef DEBUG
-CFLAGS=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
+CFLAGS+=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
else
-CFLAGS=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
+CFLAGS+=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
endif
-CC=gcc
+CC?=gcc
OBJS=$(OBJS_DIR)/tsp_auth.o \
$(OBJS_DIR)/tsp_cap.o \
--- gogoc-tsp/src/xml/Makefile.orig 2009-11-20 17:53:42.000000000 +0100
+++ gogoc-tsp/src/xml/Makefile 2010-11-19 19:51:14.000000000 +0100
@@ -14,11 +14,11 @@
ifdef DEBUG
-CFLAGS=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
+CFLAGS+=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
else
-CFLAGS=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
+CFLAGS+=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
endif
-CC=gcc
+CC?=gcc
OBJS=$(OBJS_DIR)/xmlparse.o \
$(OBJS_DIR)/xml_req.o \
--- gogoc-tsp/platform/freebsd/Makefile.orig 2009-11-20 17:53:23.000000000 +0100
+++ gogoc-tsp/platform/freebsd/Makefile 2010-11-19 19:53:22.000000000 +0100
@@ -13,13 +13,13 @@
-include platform.mak
ifdef DEBUG
-CFLAGS=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
-LDFLAGS=-g $(LD_LIB_PATHS) $(LD_LIBRARIES) -lcrypto -lpthread -lstdc++
+CFLAGS+=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
+LDFLAGS+=-g $(LD_LIB_PATHS) $(LD_LIBRARIES) -lcrypto -pthread -lstdc++
else
-CFLAGS=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
-LDFLAGS=$(LD_LIB_PATHS) $(LD_LIBRARIES) -lcrypto -lpthread -lstdc++
+CFLAGS+=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
+LDFLAGS+=$(LD_LIB_PATHS) $(LD_LIBRARIES) -lcrypto -pthread -lstdc++
endif
-CC=gcc
+CC?=gcc
OBJS=$(OBJS_DIR)/tsp_local.o \
$(OBJS_DIR)/tsp_tun.o
--- gogoc-tsp/platform/unix-common/Makefile.orig 2009-11-20 17:53:30.000000000 +0100
+++ gogoc-tsp/platform/unix-common/Makefile 2010-11-19 19:53:49.000000000 +0100
@@ -13,11 +13,11 @@
-include $(PLATFORM_DIR)/$(PLATFORM)/platform.mak
ifdef DEBUG
-CFLAGS=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -DDEBUG
+CFLAGS+=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -DDEBUG
else
-CFLAGS=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS)
+CFLAGS+=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS)
endif
-CC=gcc
+CC?=gcc
OS_UNAME=os_uname.h
OBJS=$(OBJS_DIR)/unix-main.o
--- gogoc-config/Makefile.orig 2009-11-20 17:30:23.000000000 +0100
+++ gogoc-config/Makefile 2010-11-19 20:06:16.000000000 +0100
@@ -23,20 +23,20 @@
GOGOCPALLIB_DIR=$(GOGOCPAL)/out_lib
GOGOCPALLIB=gogocpal
-CC=gcc
+CC?=gcc
-CXX=g++
+CXX?=g++
-LD=g++
+LD?=g++
-RANLIB=ranlib
+RANLIB?=ranlib
-AR=ar
+AR?=ar
ifdef DEBUG
-CXXFLAGS=-g -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DDEBUG $(HACCESS_DEFINES) $(EXTRA_CXXFLAGS)
-CFLAGS=-g -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DDEBUG $(HACCESS_DEFINES) $(EXTRA_CFLAGS)
-LDFLAGS=-g -L$(LIB_DIR) -L$(GOGOCPALLIB_DIR) -lgogocconfig -l$(GOGOCPALLIB) $(EXTRA_LDFLAGS)
+CXXFLAGS+=-g -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DDEBUG $(HACCESS_DEFINES) $(EXTRA_CXXFLAGS)
+CFLAGS+=-g -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DDEBUG $(HACCESS_DEFINES) $(EXTRA_CFLAGS)
+LDFLAGS+=-g -L$(LIB_DIR) -L$(GOGOCPALLIB_DIR) -lgogocconfig -l$(GOGOCPALLIB) $(EXTRA_LDFLAGS)
else
-CXXFLAGS=-O2 -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DNDEBUG $(HACCESS_DEFINES) $(EXTRA_CXXFLAGS)
-CFLAGS=-O2 -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DNDEBUG $(HACCESS_DEFINES) $(EXTRA_CFLAGS)
-LDFLAGS=-O2 -L$(LIB_DIR) -L$(GOGOCPALLIB_DIR) -lgogocconfig -l$(GOGOCPALLIB) $(EXTRA_LDFLAGS)
+CXXFLAGS+=-O2 -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DNDEBUG $(HACCESS_DEFINES) $(EXTRA_CXXFLAGS)
+CFLAGS+=-O2 -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DNDEBUG $(HACCESS_DEFINES) $(EXTRA_CFLAGS)
+LDFLAGS+=-O2 -L$(LIB_DIR) -L$(GOGOCPALLIB_DIR) -lgogocconfig -l$(GOGOCPALLIB) $(EXTRA_LDFLAGS)
endif
--- gogoc-messaging/Makefile.orig 2009-11-20 17:34:50.000000000 +0100
+++ gogoc-messaging/Makefile 2010-11-19 20:11:29.000000000 +0100
@@ -21,20 +21,20 @@
GOGOCPALLIB_DIR=$(GOGOCPAL)/out_lib
GOGOCPALLIB=gogocpal
-CC=gcc
+CC?=gcc
-CXX=g++
+CXX?=g++
-LD=g++
+LD?=g++
-RANLIB=ranlib
+RANLIB?=ranlib
-AR=ar
+AR?=ar
ifdef DEBUG
-CXXFLAGS=-g -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DDEBUG $(HACCESS_DEFINES) $(EXTRA_CXXFLAGS)
-CFLAGS=-g -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DDEBUG $(HACCESS_DEFINES) $(EXTRA_CFLAGS)
-LDFLAGS=-g -L$(LIB_DIR) -L$(GOGOCPALLIB_DIR) -lgogocmessaging -l$(GOGOCPALLIB) $(EXTRA_LDFLAGS)
+CXXFLAGS+=-g -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DDEBUG $(HACCESS_DEFINES) $(EXTRA_CXXFLAGS)
+CFLAGS+=-g -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DDEBUG $(HACCESS_DEFINES) $(EXTRA_CFLAGS)
+LDFLAGS+=-g -L$(LIB_DIR) -L$(GOGOCPALLIB_DIR) -lgogocmessaging -l$(GOGOCPALLIB) $(EXTRA_LDFLAGS)
else
-CXXFLAGS=-O2 -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DNDEBUG $(HACCESS_DEFINES) $(EXTRA_CXXFLAGS)
-CFLAGS=-O2 -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DNDEBUG $(HACCESS_DEFINES) $(EXTRA_CFLAGS)
-LDFLAGS=-O2 -L$(LIB_DIR) -L$(GOGOCPALLIB_DIR) -lgogocmessaging -l$(GOGOCPALLIB) $(EXTRA_LDFLAGS)
+CXXFLAGS+=-O2 -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DNDEBUG $(HACCESS_DEFINES) $(EXTRA_CXXFLAGS)
+CFLAGS+=-O2 -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DNDEBUG $(HACCESS_DEFINES) $(EXTRA_CFLAGS)
+LDFLAGS+=-O2 -L$(LIB_DIR) -L$(GOGOCPALLIB_DIR) -lgogocmessaging -l$(GOGOCPALLIB) $(EXTRA_LDFLAGS)
endif
|
