Browse code

- makefile fixes for static modules

Andrei Pelinescu-Onciul authored on 26/09/2002 11:07:13
Showing 2 changed files
... ...
@@ -19,7 +19,7 @@ extra_objs=$(extra_sources:.c=.o)
19 19
 
20 20
 static_defs= $(foreach  mod, $(static_modules), \
21 21
 		-DSTATIC_$(shell echo $(mod) | tr [:lower:] [:upper:]) )
22
-DEFS+=$(static_defs)
22
+DEFS=$(static_defs)
23 23
 modules=$(filter-out $(addprefix modules/, \
24 24
 			$(exclude_modules) $(static_modules)), \
25 25
 			$(wildcard modules/*))
... ...
@@ -125,7 +125,7 @@ YACC := $(shell echo "$${YACC}")
125 125
 #  		if enabled, allows forking of the snmp agent just before child
126 126
 #  		forking (done at the top of main_loop). Needed if you want
127 127
 #  		to use the snmp module.
128
-DEFS= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \
128
+DEFS+= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \
129 129
 	 -DOS='"$(OS)"' -DCOMPILER='"$(CC_VER)"' \
130 130
 	 -DCFG_DIR='"$(cfg-target)"'\
131 131
 	 -DPKG_MALLOC \
... ...
@@ -271,7 +271,7 @@ ifeq			($(CC_SHORTVER), 3.0)
271 271
 							#-mcpu=athlon
272 272
 else
273 273
 ifeq			($(CC_SHORTVER), 2.9x) #older gcc version (2.9[1-5])
274
-$(warning 			Old gcc detected ($(CC_SHORTVER)), use  gcc 3.0.x \
274
+$(warning 			Old gcc detected ($(CC_SHORTVER)), use  gcc >= 3.1 \
275 275
 					for better results)
276 276
 					
277 277
 					CFLAGS+=-m486 \
... ...
@@ -319,7 +319,7 @@ ifeq			($(CC_SHORTVER), 3.0)
319 319
 					#-,faster-structs #faster non Sparc ABI structure copy ops
320 320
 else			# CC_SHORTVER, 3.0
321 321
 ifeq			($(CC_SHORTVER), 2.9x) #older gcc version (2.9[1-5])
322
-$(warning 			Old gcc detected ($(CC_SHORTVER)), use  gcc 3.0.x \
322
+$(warning 			Old gcc detected ($(CC_SHORTVER)), use  gcc >= 3.1 \
323 323
 					for better results)
324 324
 					
325 325
 					CFLAGS+= -mv8 -Wa,-xarch=v8plus