gunnar: server Makefile,1.19.2.2,1.19.2.3

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
      Tag: kolab_2_1_branch
	Makefile 
Log Message:
Update the Makefile so that the horde packages build on an installed 2.1 machine.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.19.2.2
retrieving revision 1.19.2.3
diff -u -d -r1.19.2.2 -r1.19.2.3
--- Makefile	16 Jul 2007 17:41:16 -0000	1.19.2.2
+++ Makefile	20 Jul 2007 15:07:46 -0000	1.19.2.3
@@ -16,29 +16,7 @@
                kolab-resource-handlers \
                kolab-webadmin          \
 
-BASE_FILES=obmtool      \
-           obmtool.conf \
-           README.1st
-
-.PHONY: dist
-dist:
-	rm -rf stage
-	mkdir stage
-	for PKG in $(BASE_PACKAGES);     \
-	do                               \
-	  make -C $$PKG dist || exit $?; \
-	done
-	cd perl-kolab && make -f Makefile.cvs dist
-	for PKG in $(KOLAB_PACKAGES);              \
-	do                                         \
-	  cd $$PKG && make dist || exit $?; cd ..; \
-	done
-	cp $(BASE_FILES) stage/
-	echo 'Remember to update obmtool.conf!'
-
-HORDE_PACKAGES=pear/PEAR-PEAR           \
-               pear/PEAR-Archive_Tar    \
-               pear/PEAR-Auth_SASL      \
+HORDE_PACKAGES=pear/PEAR-Auth_SASL      \
                pear/PEAR-Console_Getopt \
                pear/PEAR-Date           \
                pear/PEAR-Log            \
@@ -56,20 +34,53 @@
                horde/horde-nag          \
                horde/horde-turba
 
-.PHONY: dist-horde
-dist-horde:
-	rm -rf stage
-	mkdir -p stage
-	for PKG in $(HORDE_PACKAGES);             \
-	do                                        \
-	  make -C $$PKG dist || exit $?;          \
-	  echo -e "\n==" >> stage/ChangeLog;      \
-	  echo "$$PKG" >> stage/ChangeLog;        \
-	  echo -e "==\n" >> stage/ChangeLog;      \
-	  cat $$PKG/ChangeLog >> stage/ChangeLog; \
+BASE_FILES=obmtool      \
+           obmtool.conf \
+           README.1st
+
+.PHONY: dist
+dist: stage base kolab files
+
+stage:
+	mkdir stage
+
+.PHONY: base
+bsae: stage
+	for PKG in $(BASE_PACKAGES);     \
+	do                               \
+	  make -C $$PKG dist || exit $?; \
+	done
+
+.PHONY: kolab
+kolab: stage
+	cd perl-kolab && make -f Makefile.cvs dist
+	for PKG in $(KOLAB_PACKAGES);              \
+	do                                         \
+	  cd $$PKG && make dist || exit $?; cd ..; \
+	done
+
+.PHONY: horde
+horde: stage
+	for PKG in pear/PEAR-Structures_Graph pear/PEAR-PEAR pear/PEAR-Archive_Tar;\
+	do                                              \
+	  make -C $$PKG dist || exit $?;                \
+	  /kolab/bin/openpkg rpm -ihv --force --nodeps /kolab/RPM/PKG/$${PKG/pear\//}-*-kolab.rpm; \
+	done
+	for PKG in $(HORDE_PACKAGES);                   \
+	do                                              \
+	  make -C $$PKG dist || exit $?;                \
+	  echo -e "\n==" >> stage/ChangeLog.horde;      \
+	  echo "$$PKG" >> stage/ChangeLog.horde;        \
+	  echo -e "==\n" >> stage/ChangeLog.horde;      \
+	  cat $$PKG/ChangeLog >> stage/ChangeLog.horde; \
 	done
 	cp README.webclient stage/README
 	cp obmtool-webclient.conf stage/obmtool.conf
+
+.PHONY: files
+files: stage
+	cp $(BASE_FILES) stage/
+	echo 'Remember to update obmtool.conf!'
 
 .PHONY: clean
 clean: