... | ... |
@@ -55,20 +55,24 @@ all: $(NAME) modules |
55 | 55 |
|
56 | 56 |
.PHONY: modules |
57 | 57 |
modules: |
58 |
- -@for r in $(modules); do \ |
|
59 |
- echo "" ; \ |
|
60 |
- echo "" ; \ |
|
61 |
- $(MAKE) -C $$r ; \ |
|
62 |
- done |
|
58 |
+ -@for r in $(modules) "" ; do \ |
|
59 |
+ if [ -n "$$r" ]; then \ |
|
60 |
+ echo "" ; \ |
|
61 |
+ echo "" ; \ |
|
62 |
+ $(MAKE) -C $$r ; \ |
|
63 |
+ fi ; \ |
|
64 |
+ done |
|
63 | 65 |
|
64 | 66 |
.PHONY: static_modules |
65 | 67 |
static_modules: |
66 |
- -@echo "Extra objs: $(extra_objs)" |
|
67 |
- -@for r in $(static_modules_path); do \ |
|
68 |
- echo "" ; \ |
|
69 |
- echo "Making static module $r" ; \ |
|
70 |
- $(MAKE) -C $$r static ; \ |
|
71 |
- done |
|
68 |
+ -@echo "Extra objs: $(extra_objs)" |
|
69 |
+ -@for r in $(static_modules_path) "" ; do \ |
|
70 |
+ if [ -n "$$r" ]; then \ |
|
71 |
+ echo "" ; \ |
|
72 |
+ echo "Making static module $r" ; \ |
|
73 |
+ $(MAKE) -C $$r static ; \ |
|
74 |
+ fi ; \ |
|
75 |
+ done |
|
72 | 76 |
|
73 | 77 |
|
74 | 78 |
|
... | ... |
@@ -70,9 +70,10 @@ ARCH = $(shell uname -m |sed -e s/i.86/i386/ -e s/sun4u/sparc64/ ) |
70 | 70 |
DEFS+= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \ |
71 | 71 |
-DOS='"$(OS)"' -DCOMPILER='"$(CC_VER)"'\ |
72 | 72 |
-DDNS_IP_HACK -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP \ |
73 |
- -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 \ |
|
74 | 73 |
-DF_MALLOC -DUSE_SYNONIM\ |
75 |
- -DNO_DEBUG |
|
74 |
+ -DNO_DEBUG \ |
|
75 |
+ -DNOSMP |
|
76 |
+# -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 \ |
|
76 | 77 |
#-DEXTRA_DEBUG |
77 | 78 |
#-DVQ_MALLOC -DDBG_LOCK #-DSTATS |
78 | 79 |
#-DDBG_QM_MALLOC #-DNO_DEBUG |
... | ... |
@@ -166,7 +167,7 @@ ifeq ($(CC_NAME), gcc) |
166 | 167 |
#if gcc 3.0 |
167 | 168 |
ifeq ($(CC_SHORTVER), 3.0) |
168 | 169 |
#use 32bit for now |
169 |
- CFLAGS+= -mcpu=v9 -mtune=ultrasparc -m32 \ |
|
170 |
+ CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc -m32 \ |
|
170 | 171 |
# -mcpu=v9 or ultrasparc? # -mtune implied by -mcpu |
171 | 172 |
#-mno-epilogue #try to inline function exit code |
172 | 173 |
#-mflat # omit save/restore |
... | ... |
@@ -40,24 +40,33 @@ static: $(objs) |
40 | 40 |
.PHONY: clean |
41 | 41 |
clean: |
42 | 42 |
-@rm -f $(objs) $(NAME) 2>/dev/null |
43 |
- -@for r in $(modules) $(static_modules_path); do \ |
|
44 |
- echo "module $$r" ; \ |
|
45 |
- $(MAKE) -C $$r clean ; \ |
|
43 |
+ -@for r in $(modules) $(static_modules_path) "" ; do \ |
|
44 |
+ if [ -n "$$r" ]; then \ |
|
45 |
+ echo "module $$r" ; \ |
|
46 |
+ $(MAKE) -C $$r clean ; \ |
|
47 |
+ fi ; \ |
|
46 | 48 |
done |
47 | 49 |
|
48 |
- |
|
49 |
- |
|
50 | 50 |
.PHONY: proper |
51 | 51 |
.PHONY: distclean |
52 | 52 |
.PHONY: realclean |
53 | 53 |
proper realclean distclean: clean |
54 | 54 |
-@rm -f $(depends) 2>/dev/null |
55 |
- -@for r in $(modules); do $(MAKE) -C $$r proper ; done |
|
55 |
+ -@for r in $(modules) "" ; do \ |
|
56 |
+ if [ -n "$$r" ]; then \ |
|
57 |
+ $(MAKE) -C $$r proper ; \ |
|
58 |
+ fi ; \ |
|
59 |
+ done |
|
56 | 60 |
|
57 | 61 |
.PHONY: mantainer-cleaan |
58 | 62 |
mantainer-clean: distclean |
59 | 63 |
-rm -f $(auto_gen) TAGS tags *.dbg .*.swp |
60 |
- -@for r in $(modules); do $(MAKE) -C $$r mantainer-clean ; done |
|
64 |
+ -@for r in $(modules) "" ; do \ |
|
65 |
+ if [ -n "$$r" ]; then \ |
|
66 |
+ $(MAKE) -C $$r mantainer-clean; \ |
|
67 |
+ fi ; \ |
|
68 |
+ done |
|
69 |
+ |
|
61 | 70 |
|
62 | 71 |
.PHONY: TAGS |
63 | 72 |
TAGS: |