Browse code

- makefile changes: support for recursive makefile fixed (broken when I fixed the module makefiles), EXTRA_DEFS added - debian packages updated (ser, ser-mysql, ser-jabber, ser-radius)

Andrei Pelinescu-Onciul authored on 30/05/2003 19:27:25
Showing 6 changed files
... ...
@@ -16,6 +16,9 @@
16 16
 #  2003-04-07  hacked to work with solaris install (andrei)
17 17
 #  2003-04-17  exclude modules overwritable from env. or cmd. line,
18 18
 #               added include_modules and skip_modules (andrei)
19
+#  2003-05-30  added extra_defs & EXTRA_DEFS
20
+#               Makefile.defs force-included to allow recursive make
21
+#               calls -- see comment (andrei)
19 22
 #
20 23
 
21 24
 auto_gen=lex.yy.c cfg.tab.c   #lexx, yacc etc
... ...
@@ -49,7 +52,10 @@ extra_objs=$(extra_sources:.c=.o)
49 52
 
50 53
 static_defs= $(foreach  mod, $(static_modules), \
51 54
 		-DSTATIC_$(shell echo $(mod) | tr [:lower:] [:upper:]) )
52
-DEFS=$(static_defs)
55
+
56
+override extra_defs+=$(static_defs) $(EXTRA_DEFS)
57
+export extra_defs
58
+
53 59
 modules=$(filter-out $(addprefix modules/, \
54 60
 			$(exclude_modules) $(static_modules)), \
55 61
 			$(wildcard modules/*))
... ...
@@ -67,12 +73,26 @@ NAME=ser
67 73
 ALLDEP=Makefile Makefile.sources Makefile.defs Makefile.rules
68 74
 
69 75
 #include general defs (like CC, CFLAGS  a.s.o)
76
+# hack to force makefile.defs re-inclusion (needed when make calls itself with
77
+# other options -- e.g. make bin)
78
+makefile_defs=0
79
+DEFS:=
70 80
 include Makefile.defs
71 81
 
72 82
 #export relevant variables to the sub-makes
73 83
 export DEFS PROFILE CC  LD MKDEP MKTAGS CFLAGS LDFLAGS MOD_CFLAGS MOD_LDFLAGS
74 84
 export LEX YACC YACC_FLAGS
75 85
 export PREFIX LOCALBASE
86
+# export relevant variables for recursive calls of this makefile 
87
+# (e.g. make deb)
88
+#export LIBS
89
+#export TAR 
90
+#export NAME RELEASE OS ARCH 
91
+#export cfg-prefix cfg-dir bin-prefix bin-dir modules-prefix modules-dir
92
+#export doc-prefix doc-dir man-prefix man-dir ut-prefix ut-dir
93
+#export cfg-target modules-target
94
+#export INSTALL INSTALL-CFG INSTALL-BIN INSTALL-MODULES INSTALL-DOC INSTALL-MAN 
95
+#export INSTALL-TOUCH
76 96
 
77 97
 
78 98
 # include the common rules
... ...
@@ -122,10 +142,10 @@ dbg: ser
122 142
 .PHONY: tar
123 143
 tar: mantainer-clean 
124 144
 	$(TAR) -C .. \
125
-		--exclude=$(notdir $(CURDIR))/test \
126
-		--exclude=$(notdir $(CURDIR))/tmp \
127
-		--exclude=$(notdir $(CURDIR))/debian/ser \
128
-		--exclude=$(notdir $(CURDIR))/debian/ser-mysql-module \
145
+		--exclude=$(notdir $(CURDIR))/test* \
146
+		--exclude=$(notdir $(CURDIR))/tmp* \
147
+		--exclude=$(notdir $(CURDIR))/debian/ser* \
148
+		--exclude=CVS* \
129 149
 		 -zcf ../$(NAME)-$(RELEASE)_src.tar.gz  $(notdir $(CURDIR)) 
130 150
 
131 151
 # binary dist. tar.gz
... ...
@@ -7,6 +7,7 @@
7 7
 #   INSTALL, TAR , CC, LEX, YACC,
8 8
 #   CPU, CC_EXTRA_OPTS,
9 9
 #   exclude_modules, skip_modules, include_modules
10
+#   extra_defs
10 11
 #
11 12
 # History:
12 13
 # --------
... ...
@@ -21,6 +22,7 @@
21 22
 #               for, used only with gcc-3.x) (andrei)
22 23
 #  2003-05-23  check if this makefile was already included (andrei)
23 24
 #              removed -DDIGEST_DOMAIN (andrei)
25
+#  2003-05-30  added extra_defs (andrei)
24 26
 
25 27
 
26 28
 # check if already included/exported
... ...
@@ -35,7 +37,7 @@ export makefile_defs
35 37
 VERSION = 0
36 38
 PATCHLEVEL = 8
37 39
 SUBLEVEL =   11
38
-EXTRAVERSION = pre28
40
+EXTRAVERSION = pre29
39 41
 
40 42
 RELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
41 43
 OS = $(shell uname -s | sed -e s/SunOS/solaris/ | tr "[A-Z]" "[a-z]")
... ...
@@ -185,7 +187,8 @@ YACC := $(shell echo "$${YACC}")
185 187
 #		disable the tcp Nagle algorithm (lower delay)
186 188
 
187 189
 
188
-DEFS+= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \
190
+DEFS+= $(extra_defs) \
191
+	 -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \
189 192
 	 -DOS='"$(OS)"' -DCOMPILER='"$(CC_VER)"' -D__CPU_$(ARCH) -D__OS_$(OS) \
190 193
 	 -DCFG_DIR='"$(cfg-target)"'\
191 194
 	 -DPKG_MALLOC \
... ...
@@ -1,14 +1,27 @@
1
+ser (0.8.11-pre29) unstable; urgency=low
2
+
3
+  * RFC3261 support (TCP, loose routing)
4
+
5
+  * lots of new modules:  rich access control lists (permissions), database in
6
+    textfile support (dbtext), presence agent (pa), enum support (enum),
7
+    voicemail interface (vm), NAT traversal utility for Cisco/ATA NAT
8
+    (nathelper)
9
+
10
+  * arhitectural  improvements
11
+
12
+ -- Andrei Pelinescu-Onciul <pelinescu-onciul@fokus.fraunhofer.de>  Fri, 30 May 2003 18:11:52 +0200
13
+
1 14
 ser (0.8.10) unstable; urgency=low
2 15
 
3
-  * fixes lots of  bugs in 0.8.9 (log not working, ipv6 address conversion)
4
-  
5
-  * introduces port support in uri matching with myself
6
-  
7
-  * faster hash function (statefull performance increase ~10%)
16
+ * fixes lots of  bugs in 0.8.9 (log not working, ipv6 address conversion)
17
+
18
+ * introduces port support in uri matching with myself
19
+
20
+ * faster hash function (statefull performance increase ~10%)
8 21
 
9
-  * modules updates (sms, jabber)
22
+ * modules updates (sms, jabber)
10 23
 
11
-  * the jabber module is in a separate package now (it depends on libexpat)
24
+ * the jabber module is in a separate package now (it depends on libexpat)
12 25
 
13 26
  -- Andrei Pelinescu-Onciul <pelinescu-onciul@fokus.gmd.de>  Tue, 4 Nov 2002 17:23:37 +0200
14 27
 
... ...
@@ -1,8 +1,8 @@
1 1
 Source: ser
2 2
 Section: net
3 3
 Priority: optional
4
-Maintainer: Andrei Pelinescu-Onciul <pelinescu-onciul@fokus.gmd.de>
5
-Build-Depends: debhelper (>> 3.0.0), libmysqlclient-dev, libexpat1-dev, zlib1g-dev
4
+Maintainer: Andrei Pelinescu-Onciul <pelinescu-onciul@fokus.fraunhofer.de>
5
+Build-Depends: debhelper (>> 3.0.0), libmysqlclient-dev, libexpat1-dev, zlib1g-dev, libradius1-dev
6 6
 Standards-Version: 3.5.2
7 7
 
8 8
 Package: ser
... ...
@@ -35,3 +35,11 @@ Description: contains the jabber module (sip-jabber message translation)
35 35
  This has been split out of the main ser package, so that ser will not
36 36
  depend upon libexpat. This module will enable you to use ser to translate
37 37
   sip messages into jabber messages.
38
+
39
+Package: ser-radius-modules
40
+Architecture: any
41
+Depends: ${shlibs:Depends}, ser (= ${Source-Version})
42
+Description: contains the jabber module (sip-jabber message translation)
43
+ This has been split out of the main ser package, so that ser will not
44
+ depend upon libradius1. This modules will enable you to authenticate, 
45
+ do group membership checking or check the messages uris using radius.
... ...
@@ -3,6 +3,11 @@
3 3
 # GNU copyright 1997 to 1999 by Joey Hess.
4 4
 #
5 5
 # $Id$
6
+#
7
+# History:
8
+# --------
9
+#  2003-05-30  updated for the 0.8.11 release, changed modules list and
10
+#              some ser make options (andrei)
6 11
 
7 12
 
8 13
 # Uncomment this to turn on verbose mode.
... ...
@@ -11,6 +16,24 @@
11 16
 # This is the debhelper compatibility version to use.
12 17
 export DH_COMPAT=3
13 18
 
19
+# modules not in the "main" package or unstable 
20
+EXCLUDED_MODULES=	mysql jabber auth_radius group_radius uri_radius \
21
+					postgress snmp cpl cpl-c ext extcmd mangler pdt
22
+
23
+# modules depending on mysql
24
+MYSQL_MODULES=mysql
25
+#jabber related modules
26
+JABBER_MODULES=jabber
27
+#module depending on radiusclient
28
+RADIUS_MODULES=auth_radius group_radius uri_radius
29
+
30
+# the same but with path prepended (needed for modules="...")
31
+MYSQL_MOD_PATH=$(addprefix modules/, $(MYSQL_MODULES))
32
+JABBER_MOD_PATH=$(addprefix modules/, $(JABBER_MODULES))
33
+RADIUS_MOD_PATH=$(addprefix modules/, $(RADIUS_MODULES))
34
+
35
+
36
+
14 37
 
15 38
 
16 39
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
... ...
@@ -34,9 +57,10 @@ build-stamp: configure-stamp
34 57
 	dh_testdir
35 58
 
36 59
 	# Add here commands to compile the package.
37
-	$(MAKE) all  exclude_modules="mysql jabber" cfg-target=/etc/ser/
38
-	$(MAKE) modules modules=modules/mysql cfg-target=/etc/ser/
39
-	$(MAKE) modules modules=modules/jabber cfg-target=/etc/ser/
60
+	$(MAKE) all  skip_modules="$(EXCLUDED_MODULES)" cfg-target=/etc/ser/
61
+	$(MAKE) modules modules="$(MYSQL_MOD_PATH)" cfg-target=/etc/ser/
62
+	$(MAKE) modules modules="$(JABBER_MOD_PATH)" cfg-target=/etc/ser/
63
+	$(MAKE) modules modules="$(RADIUS_MOD_PATH)" cfg-target=/etc/ser/
40 64
 	#/usr/bin/docbook-to-man debian/ser.sgml > ser.1
41 65
 
42 66
 	touch build-stamp
... ...
@@ -47,7 +71,9 @@ clean:
47 71
 	rm -f build-stamp configure-stamp
48 72
 
49 73
 	# Add here commands to clean up after the build process.
50
-	-$(MAKE) clean
74
+	-$(MAKE) \
75
+		include_modules="$(MYSQL_MODULES) $(JABBER_MODULES) $(RADIUS_MODULES)"\
76
+		 clean
51 77
 
52 78
 	dh_clean
53 79
 
... ...
@@ -58,23 +84,29 @@ install: build
58 84
 	dh_installdirs
59 85
 
60 86
 	# Add here commands to install the package into debian/ser
61
-	$(MAKE) install  exclude_modules="mysql jabber" \
87
+	$(MAKE) install  skip_modules="$(EXCLUDED_MODULES)" \
62 88
 		basedir=$(CURDIR)/debian/ser \
63 89
 		prefix=/usr \
64 90
 		cfg-prefix=$(CURDIR)/debian/ser \
65 91
 		cfg-target=/etc/ser/
66 92
 	# install only the mysql module
67
-	$(MAKE) install-modules modules=modules/mysql  \
93
+	$(MAKE) install-modules modules="$(MYSQL_MOD_PATH)"  \
68 94
 		basedir=$(CURDIR)/debian/ser-mysql-module \
69 95
 		prefix=/usr \
70 96
 		cfg-prefix=$(CURDIR)/debian/ser-mysql-module \
71 97
 		cfg-target=/etc/ser/
72 98
 	#install only the jabber module
73
-	$(MAKE) install-modules modules=modules/jabber  \
99
+	$(MAKE) install-modules modules="$(JABBER_MOD_PATH)"  \
74 100
 		basedir=$(CURDIR)/debian/ser-jabber-module \
75 101
 		prefix=/usr \
76 102
 		cfg-prefix=$(CURDIR)/debian/ser-jabber-module \
77 103
 		cfg-target=/etc/ser/
104
+	#install only the radius modules
105
+	$(MAKE) install-modules modules="$(RADIUS_MOD_PATH)"  \
106
+		basedir=$(CURDIR)/debian/ser-radius-modules \
107
+		prefix=/usr \
108
+		cfg-prefix=$(CURDIR)/debian/ser-radius-modules \
109
+		cfg-target=/etc/ser/
78 110
 	#dh_movefiles
79 111
 
80 112
 
81 113
new file mode 100644
... ...
@@ -0,0 +1 @@
1
+libradiusclient 0 libradius1 (>= 0.3.2-5)