Browse Source

- more sun makefile enhacements

Andrei Pelinescu-Onciul 23 năm trước cách đây
mục cha
commit
e7a9bd307a
4 tập tin đã thay đổi với 37 bổ sung23 xóa
  1. 15 11
      Makefile
  2. 4 3
      Makefile.defs
  3. 16 7
      Makefile.rules
  4. 2 2
      test/th-uri-2.cfg

+ 15 - 11
Makefile

@@ -55,20 +55,24 @@ all: $(NAME) modules
 
 .PHONY: modules
 modules:
-	-@for r in $(modules); do \
-		echo  "" ; \
-		echo  "" ; \
-		$(MAKE) -C $$r ; \
-	done
+	-@for r in $(modules) "" ; do \
+		if [ -n "$$r" ]; then \
+			echo  "" ; \
+			echo  "" ; \
+			$(MAKE) -C $$r ; \
+		fi ; \
+	done 
 
 .PHONY: static_modules
 static_modules:
-	-@echo "Extra objs: $(extra_objs)"
-	-@for r in $(static_modules_path); do \
-		echo  "" ; \
-		echo  "Making static module $r" ; \
-		$(MAKE) -C $$r static ; \
-	done
+	-@echo "Extra objs: $(extra_objs)" 
+	-@for r in $(static_modules_path) "" ; do \
+		if [ -n "$$r" ]; then \
+			echo  "" ; \
+			echo  "Making static module $r" ; \
+			$(MAKE) -C $$r static ; \
+		fi ; \
+	done 
 
 
 	

+ 4 - 3
Makefile.defs

@@ -70,9 +70,10 @@ ARCH = $(shell uname -m |sed -e s/i.86/i386/ -e s/sun4u/sparc64/ )
 DEFS+= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \
 	 -DOS='"$(OS)"' -DCOMPILER='"$(CC_VER)"'\
 	 -DDNS_IP_HACK  -DPKG_MALLOC -DSHM_MEM  -DSHM_MMAP \
-	 -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 \
 	 -DF_MALLOC  -DUSE_SYNONIM\
-	 -DNO_DEBUG
+	 -DNO_DEBUG \
+	 -DNOSMP
+#	 -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 \
 	 #-DEXTRA_DEBUG 
 	 #-DVQ_MALLOC  -DDBG_LOCK  #-DSTATS
 	 #-DDBG_QM_MALLOC #-DNO_DEBUG
@@ -166,7 +167,7 @@ ifeq		($(CC_NAME), gcc)
 				#if gcc 3.0
 ifeq			($(CC_SHORTVER), 3.0)
 					#use 32bit for now
-					CFLAGS+= -mcpu=v9 -mtune=ultrasparc  -m32  \
+					CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc  -m32  \
 					# -mcpu=v9 or ultrasparc? # -mtune implied by -mcpu
 					#-mno-epilogue #try to inline function exit code
 					#-mflat # omit save/restore

+ 16 - 7
Makefile.rules

@@ -40,24 +40,33 @@ static: $(objs)
 .PHONY: clean
 clean:
 	-@rm -f $(objs) $(NAME) 2>/dev/null
-	-@for r in $(modules) $(static_modules_path); do \
-		echo "module $$r" ; \
-		$(MAKE) -C $$r clean ; \
+	-@for r in $(modules) $(static_modules_path) "" ; do \
+		if [ -n "$$r" ]; then \
+			echo "module $$r" ; \
+			$(MAKE) -C $$r clean ; \
+		fi ; \
 	done
 
-
-
 .PHONY: proper
 .PHONY: distclean
 .PHONY: realclean
 proper realclean distclean: clean 
 	-@rm -f $(depends) 2>/dev/null
-	-@for r in $(modules); do $(MAKE) -C $$r proper ; done
+	-@for r in $(modules) "" ; do \
+		if [ -n "$$r" ]; then \
+			 $(MAKE) -C $$r proper ; \
+		fi ; \
+	done 
 
 .PHONY: mantainer-cleaan
 mantainer-clean: distclean
 	-rm -f $(auto_gen) TAGS tags *.dbg .*.swp
-	-@for r in $(modules); do $(MAKE) -C $$r mantainer-clean ; done
+	-@for r in $(modules) "" ; do \
+		if [ -n "$$r" ]; then \
+			$(MAKE) -C $$r mantainer-clean; \
+		fi ; \
+	 done 
+
 
 .PHONY: TAGS
 TAGS:

+ 2 - 2
test/th-uri-2.cfg

@@ -21,8 +21,8 @@ dns=on           # (cmd. line: -r)
 rev_dns=yes      # (cmd. line: -R)
 #port=5070
 #listen=127.0.0.1
-#listen=192.168.57.33
-listen=10.0.0.179
+listen=192.168.57.33
+#listen=10.0.0.179
 loop_checks=0
 # for more info: sip_router -h