[Fedora-directory-commits] adminserver Makefile,1.16,1.17

[Doctor Conrad]

Author: rmeggins

Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16896/adminserver

Modified Files:
    Makefile 
Log Message:
It's a little bit tricky.  The base package is a dependency of both the main admin server package and the directory server package.  However, it works if you just create a zero length .zip file for the base archive - you get a warning when running setup, but everything installs correctly.  While it's not perfect (it will be addressed for the next major release) it will at least allow those developers who do not want to use java at all to build and install.

You must use "make NOJAVA=1 ..." to build and package admin server without java.

Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Makefile	3 Nov 2005 23:20:38 -0000	1.16
+++ Makefile	18 Jan 2006 18:24:14 -0000	1.17
@@ -30,6 +30,14 @@
 include nsconfig.mk
 include components.mk

+PACKAGEDEPS = start_time
+
+ifndef NOJAVA
+PACKAGEDEPS += ldapjdk nmcjdk jsssdk jsslib
+endif
+
+PACKAGEDEPS += pkgBase pkgAdmin pkgMcc end_time
+
 all: buildAndPkgAdmin

buildAndPkgAdmin: buildOxygen pkgOxygen
@@ -38,16 +46,18 @@
    @echo
    @echo The following are build targets that you can choose from:
    @echo
-	@echo "   gmake buildAndPkgAdmin (the default if no targets are given)"
-	@echo "   gmake buildAdmin"
-	@echo "   gmake buildOxygen"
-	@echo "   gmake buildConsole"
-	@echo "   gmake pkgAdmin"
-	@echo "   gmake pkgOxygen"
-	@echo "   gmake pkgConsole"
-	@echo "   gmake pkgL10NOxygen"
-	@echo "   gmake docConsole"
-	@echo "   gmake acceptAdmin"
+	@echo "   $(MAKE) buildAndPkgAdmin (the default if no targets are given)"
+	@echo "   $(MAKE) buildAdmin"
+	@echo "   $(MAKE) buildOxygen"
+	@echo "   $(MAKE) buildConsole"
+	@echo "   $(MAKE) pkgAdmin"
+	@echo "   $(MAKE) pkgOxygen"
+	@echo "   $(MAKE) pkgConsole"
+	@echo "   $(MAKE) pkgL10NOxygen"
+	@echo "   $(MAKE) docConsole"
+	@echo "   $(MAKE) acceptAdmin"
+	@echo ""
+	@echo Use $(MAKE) NOJAVA=1 to skip building/packaging any Java (console or command line) code

pumpkin:
    $(PERL) pumpkin.pl $(PUMPKIN_AGE) pumpkin.dat
@@ -211,7 +221,7 @@
    @echo
    @echo ============== Finished ============================

-pkgOxygen:start_time ldapjdk nmcjdk jsssdk jsslib pkgBase pkgAdmin pkgMcc end_time
+pkgOxygen: $(PACKAGEDEPS)
    @echo
    @echo
    @echo