Browse code

- updated Makefiles to work with the new module ones - removed -DDIGEST_DOMAIN (unused) and -DVOICE_MAIL from Makefile.defs

Andrei Pelinescu-Onciul authored on 23/05/2003 15:45:01
Showing 3 changed files
... ...
@@ -19,13 +19,23 @@
19 19
 #               (too many symbols for pic13)  (andrei)
20 20
 #  2003-04-16  added CC_EXTRA_OPTS, s/march/mcpu, added CPU (cpu to optimize 
21 21
 #               for, used only with gcc-3.x) (andrei)
22
+#  2003-05-23  check if this makefile was already included (andrei)
23
+#              removed -DDIGEST_DOMAIN (andrei)
24
+
25
+
26
+# check if already included/exported
27
+
28
+ifeq ($(makefile_defs), 1)
29
+else
30
+makefile_defs=1
31
+export makefile_defs
22 32
 
23 33
 
24 34
 #version number
25 35
 VERSION = 0
26 36
 PATCHLEVEL = 8
27 37
 SUBLEVEL =   11
28
-EXTRAVERSION = pre27
38
+EXTRAVERSION = pre28
29 39
 
30 40
 RELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
31 41
 OS = $(shell uname -s | sed -e s/SunOS/solaris/ | tr "[A-Z]" "[a-z]")
... ...
@@ -173,15 +183,6 @@ YACC := $(shell echo "$${YACC}")
173 183
 #		not work, use it only if you really now what you are doing)
174 184
 # -DDISABLE_NAGLE
175 185
 #		disable the tcp Nagle algorithm (lower delay)
176
-# -DVOICE_MAIL
177
-#               enables voicemail support in ser core and in tm module
178
-#               voicemail needs also -D_TOTAG
179
-#
180
-# -DDIGEST_DOMAIN
181
-#               enables further parsing of digest username. Some clients put @domain
182
-#               in username digest parameter because realm parameter is not protected
183
-#               by the digest. This hasn't been standardized, but several user agents
184
-#               use this.
185 186
 
186 187
 
187 188
 DEFS+= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \
... ...
@@ -194,7 +195,6 @@ DEFS+= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \
194 195
 	 -DUSE_IPV6 \
195 196
 	 -DUSE_TCP \
196 197
 	 -DDISABLE_NAGLE \
197
-	 -DDIGEST_DOMAIN \
198 198
 	 -DDBG_QM_MALLOC \
199 199
 	 #-DF_MALLOC \
200 200
 	 #-DNO_DEBUG \
... ...
@@ -661,3 +661,9 @@ $(warning	No locking method found so far, trying SYS V sems)
661 661
 		DEFS+= -DUSE_SYSV_SEM  # try sys v sems
662 662
 		found_lock_method=yes
663 663
 endif
664
+
665
+
666
+
667
+
668
+
669
+endif  # ifeq ($(makefile_defs, 1)
... ...
@@ -19,8 +19,9 @@ ifeq ($(MAKELEVEL), 0)
19 19
 # make called directly in the module dir!
20 20
 
21 21
 $(warning "you should run make from the main ser directory")
22
-include ../../Makefile.defs
23
-ALLDEP+=../../Makefile.defs
22
+ifneq ($(makefile_defs), 1)
23
+$(error "the local makefile does not include Makefile.defs!")
24
+endif
24 25
 
25 26
 else
26 27
 # called by the main Makefile
... ...
@@ -1,6 +1,6 @@
1 1
 
2 2
 
3
-1 linux-i386/gcc2.96
3
+1 linux-i386/gcc2.95
4 4
 2 linux-i386/gcc3.3
5 5
 3 linux-i386/icc
6 6
 4 freebsd-i386/gcc
... ...
@@ -26,43 +26,43 @@ checked:
26 26
 
27 27
 module_name       1  2  3  4  5  6  7  8
28 28
 core                 o  o           o  
29
-acc                  I  I           I  I
30
-auth                 o  o           o  o
31
-auth_db              o  o           o  o
32
-auth_radius          I  I           I  I
33
-cpl             P    o  o           o  o
34
-cpl-c           D    I  I           I  I
35
-dbtext               o  o           o  o
36
-domain               o  o           o  o
37
-enum                 o  o           o  o
38
-exec                 o  o           o  o
39
-ext                  o  o           o  o
40
-extcmd               o  o           o  o
41
-group                o  o           o  o
42
-group_radius         I  I           I  I
43
-jabber               o  o           Wm W
44
-mangler              o  o           W  o
45
-maxfwd               o  o           o  o
46
-msilo                o  o           o  o
47
-mysql                o  o           o  o
48
-nathelper            o  o           o  o
49
-pa                   o  o           o  o
50
-pdt                  o  o           o  o
51
-persmissions         o  o           o  o
52
-pike                 o  o           o  o
53
-postgress            I  I           I  I
54
-print                o  o           o  o
55
-registrar            o  o           o  o
56
-rr                   o  o           o  o
57
-sl                   o  o           o  o
58
-sms                  o  o           o  o
59
-snmp      D          I  I           I  I
60
-textops              o  o           o  o
61
-tm                   o  o           o  o
62
-uri                  o  o           o  o
63
-uri_radius           I  I           I  I
64
-usrloc               o  o           o  W
65
-vm                   o  o           o  o
29
+acc                o I  I           I  I
30
+auth               o o  o           o  o
31
+auth_db            o o  o           o  o
32
+auth_radius        o I  I           I  I
33
+cpl             P  o o  o           o  o
34
+cpl-c           D  I I  I           I  I
35
+dbtext             o o  o           o  o
36
+domain             o o  o           o  o
37
+enum               o o  o           o  o
38
+exec               o o  o           o  o
39
+ext                o o  o           o  o
40
+extcmd             W o  o           o  o
41
+group              o o  o           o  o
42
+group_radius       W I  I           I  I
43
+jabber             o o  o           Wm W
44
+mangler            o o  o           W  o
45
+maxfwd             o o  o           o  o
46
+msilo              o o  o           o  o
47
+mysql              o o  o           o  o
48
+nathelper          o o  o           o  o
49
+pa                 o o  o           o  o
50
+pdt                o o  o           o  o
51
+persmissions       o o  o           o  o
52
+pike               o o  o           o  o
53
+postgress          I I  I           I  I
54
+print              o o  o           o  o
55
+registrar          o o  o           o  o
56
+rr                 o o  o           o  o
57
+sl                 o o  o           o  o
58
+sms                o o  o           o  o
59
+snmp      D        I I  I           I  I
60
+textops            o o  o           o  o
61
+tm                 o o  o           o  o
62
+uri                o o  o           o  o
63
+uri_radius         o I  I           I  I
64
+usrloc             o o  o           o  W
65
+vm                 o o  o           o  o
66 66
 
67 67
 
68 68