[Fedora-directory-commits] adminserver/admserv/console Makefile, 1.5, 1.6

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

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

Modified Files:
	Makefile 
Log Message:
Bug: 192785
Description: Admin Server: Move admin server console into a separate package
Reviewed by: Noriko (Thanks!)
Moved files into the top level admservconsole module - changed admin server build/packaging to pick up this as a component - removed now useless java build/makefiles



Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/console/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile	29 Sep 2005 22:11:58 -0000	1.5
+++ Makefile	23 May 2006 22:13:37 -0000	1.6
@@ -32,31 +32,15 @@
 
 include $(BUILD_ROOT)/nsconfig.mk
 include $(BUILD_ROOT)/components.mk
-include javarules.mk
 
-CMDLNPATH=com/netscape/management/admserv/cmdln
-CLASSESDIR=$(BUILD_ROOT)/built/classes
 PACKAGEDIR=$(BUILD_ROOT)/built/package/java
 
-LDAPJDK.JAR = -Dldapjdk.jar=$(LDAPJDK_DIR)/$(LDAPJDK)
-CONSOLE.ROOT = -Dconsole.root=$(CONSOLE_JAR_DIR)
-
 all: build
 
-build: ldapjdk nmcjdk $(ANT_DEP)
-	$(ANT) -Dlang=en $(LDAPJDK.JAR) $(CONSOLE.ROOT) build
-	cp -p src/$(CMDLNPATH)/admconfig.dat $(CLASSESDIR)/$(CMDLNPATH)
-	cp -p src/$(CMDLNPATH)/version.dat $(CLASSESDIR)/$(CMDLNPATH)
+build: ldapjdk nmcjdk
 	cd cmdln; $(MAKE) $(MFLAGS)
 
-package: $(ANT_DEP)
-	$(ANT) -Dlang=en $(LDAPJDK.JAR) $(CONSOLE.ROOT) dist
+package:
 	cp smartupdate/goto.gif $(PACKAGEDIR)
 	cp smartupdate/spacer.gif $(PACKAGEDIR)
 	cp smartupdate/start-console.html $(PACKAGEDIR)
-
-doc: $(ANT_DEP)
-	$(ANT) javadoc
-
-clean:
-	$(ANT) clean