gunnar: server Makefile,1.33,1.34 install-kolab.sh,1.6,1.7

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv2760

Modified Files:
	Makefile install-kolab.sh 
Log Message:
Update the Makefile and the installer for the new packages.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- Makefile	5 Aug 2007 06:25:40 -0000	1.33
+++ Makefile	16 Aug 2007 10:53:19 -0000	1.34
@@ -30,11 +30,18 @@
               php                     \
               php-smarty
 
+PERL_PACKAGES=perl-kolab              \
+              kolabconf
+
+PERL_MAKEFILES=$(PERL_PACKAGES:%=%/Makefile)
+
 KOLAB_PACKAGES=perl-kolab              \
+               php-kolab               \
                kolabconf               \
                kolabd                  \
+               kolab-freebusy          \
+               kolab-filter            \
                kolab-horde-framework   \
-               kolab-resource-handlers \
                kolab-webadmin          \
 
 HORDE_PACKAGES=pear/PEAR-Auth_SASL      \
@@ -42,8 +49,12 @@
                pear/PEAR-Log            \
                pear/PEAR-Mail           \
                pear/PEAR-Mail_Mime      \
-               pear/PEAR-Net_Sieve      \
                pear/PEAR-Net_Socket     \
+               pear/PEAR-Net_URL        \
+               pear/PEAR-Net_Sieve      \
+               pear/PEAR-Net_SMTP       \
+               pear/PEAR-Net_LMTP       \
+               pear/PEAR-HTTP_Request   \
                horde/fbview-horde       \
                horde/fbview-kronolith   \
                horde/horde-framework    \
@@ -77,17 +88,14 @@
 	done
 
 .PHONY: kolab
-kolab: stage perl-kolab/Makefile kolabconf/Makefile
+kolab: stage $(PERL_MAKEFILES)
 	for PKG in $(KOLAB_PACKAGES);              \
 	do                                         \
 	  cd $$PKG && make dist || exit $?; cd ..; \
 	done
 
-perl-kolab/Makefile: perl-kolab/Makefile.PL
-	cd perl-kolab && perl Makefile.PL
-
-kolabconf/Makefile: kolabconf/Makefile.PL
-	cd kolabconf && perl Makefile.PL
+$(PERL_MAKEFILES): $(@:%=%.PL)
+	cd $(@:%/Makefile=%) && perl Makefile.PL
 
 .PHONY: horde
 horde: stage
@@ -121,9 +129,11 @@
 	done
 
 .PHONY: clean-kolab
-clean-kolab: stage
-	cd perl-kolab && perl Makefile.PL && make clean_all
-	cd kolabconf && perl Makefile.PL && make clean_all
+clean-kolab: $(PERL_MAKEFILES)
+	for PKG in $(KOLAB_PACKAGES);                   \
+	do                                              \
+	  make -C $$PKG clean_all || exit $?;           \
+	done
 
 .PHONY: clean-horde
 clean-horde:

Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- install-kolab.sh	5 Aug 2007 05:42:21 -0000	1.6
+++ install-kolab.sh	16 Aug 2007 10:53:19 -0000	1.7
@@ -9,7 +9,7 @@
 
 INSTALL=""
 
-PACKAGES="openpkg-tools kolabd kolab-webadmin kolab-resource-handlers"
+PACKAGES="openpkg-tools kolabd kolab-filter kolab-freebusy kolab-webadmin"
 DEFINE=""
 
 #Flags