From 6a0bf37c47b4efa4c5882472d6b9cf846d4765c3 Mon Sep 17 00:00:00 2001 From: "miodrag%netscape.com" Date: Sun, 29 Aug 1999 21:01:12 +0000 Subject: [PATCH] Removed manifest.mf dependency --- directory/java-sdk/ldap.mk | 7 +++---- directory/java-sdk/ldapsp.mk | 5 ++--- directory/java-sdk/ldapsp/manifest.mf | 0 directory/java-sdk/manifest.mf | 0 4 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 directory/java-sdk/ldapsp/manifest.mf delete mode 100644 directory/java-sdk/manifest.mf diff --git a/directory/java-sdk/ldap.mk b/directory/java-sdk/ldap.mk index 180109de9b0..5ed0ab9861b 100644 --- a/directory/java-sdk/ldap.mk +++ b/directory/java-sdk/ldap.mk @@ -137,9 +137,8 @@ DOCCLASSES=netscape.ldap netscape.ldap.beans netscape.ldap.controls \ all: classes basics: $(DISTDIR) $(CLASSDIR) - cp -p manifest.mf $(CLASS_DEST) -classes: LDAPCLASSES BEANS TOOLS +classes: LDAPCLASSES BEANS doc: $(DISTDIR) $(DOCDIR) DOCS @@ -153,7 +152,7 @@ tests: $(CLASSDIR) package: basepackage filterpackage beanpackage docpackage basepackage: $(CLASSPACKAGEDIR) - cd $(DISTDIR)/classes; rm -f ../packages/$(BASEPACKAGENAME); $(JAR) cvfm ../packages/$(BASEPACKAGENAME) manifest.mf netscape/ldap/*.class netscape/ldap/client/*.class netscape/ldap/client/opers/*.class netscape/ldap/ber/stream/*.class netscape/ldap/controls/*.class netscape/ldap/util/*.class netscape/ldap/errors/*.props com/netscape/sasl/*.class com/netscape/sasl/mechanisms/*.class tools/*.class + cd $(DISTDIR)/classes; rm -f ../packages/$(BASEPACKAGENAME); $(JAR) cvf ../packages/$(BASEPACKAGENAME) netscape/ldap/*.class netscape/ldap/client/*.class netscape/ldap/client/opers/*.class netscape/ldap/ber/stream/*.class netscape/ldap/controls/*.class netscape/ldap/util/*.class netscape/ldap/errors/*.props com/netscape/sasl/*.class com/netscape/sasl/mechanisms/*.class *.class beanpackage: $(CLASSPACKAGEDIR) cd $(DISTDIR)/classes; rm -f ../packages/$(BEANPACKAGENAME); $(JAR) cvf ../packages/$(BEANPACKAGENAME) netscape/ldap/beans @@ -188,7 +187,7 @@ ERRORS: basics $(ERRORSDIR) CONTROLS: basics cd ldapjdk/$(SRCDIR)/controls; $(JAVAC) -d "$(CLASS_DEST)" *.java -LDAPCLASSES: BER OPERS CLIENT MAIN UTIL CONTROLS ERRORS SASL SASLMECHANISM +LDAPCLASSES: BER OPERS CLIENT MAIN UTIL CONTROLS ERRORS SASL SASLMECHANISM TOOLS BEANS: OTHERBEANS diff --git a/directory/java-sdk/ldapsp.mk b/directory/java-sdk/ldapsp.mk index 61db1ce96f2..734544216d5 100644 --- a/directory/java-sdk/ldapsp.mk +++ b/directory/java-sdk/ldapsp.mk @@ -67,7 +67,6 @@ else BASEPACKAGENAME=ldapsp.jar endif CLASSPACKAGE=$(CLASSPACKAGEDIR)/$(PACKAGENAME) -MANIFEST=$(BASEDIR)/ldapsp/manifest.mf ifndef JAVADOC JAVADOC=javadoc -classpath "$(JAVACLASSPATH)" @@ -94,7 +93,7 @@ basics: $(DISTDIR) $(CLASSDIR) classes: JNDICLASSES basepackage: $(CLASSPACKAGEDIR) - cd $(DISTDIR)/classes; rm -f ../packages/$(BASEPACKAGENAME); $(JAR) cvfm ../packages/$(BASEPACKAGENAME) $(MANIFEST) com/netscape/jndi/ldap/*.class com/netscape/jndi/ldap/common/*.class com/netscape/jndi/ldap/schema/*.class com/netscape/jndi/ldap/controls/*.class + cd $(DISTDIR)/classes; rm -f ../packages/$(BASEPACKAGENAME); $(JAR) cvf ../packages/$(BASEPACKAGENAME) com/netscape/jndi/ldap/*.class com/netscape/jndi/ldap/common/*.class com/netscape/jndi/ldap/schema/*.class com/netscape/jndi/ldap/controls/*.class MAIN: basics cd ldapsp/$(SRCDIR); $(JAVAC) -d $(CLASS_DEST) *.java @@ -126,4 +125,4 @@ $(DISTDIR): mkdir -p $@ $(CLASSDIR): - mkdir -p $@ \ No newline at end of file + mkdir -p $@ diff --git a/directory/java-sdk/ldapsp/manifest.mf b/directory/java-sdk/ldapsp/manifest.mf deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/directory/java-sdk/manifest.mf b/directory/java-sdk/manifest.mf deleted file mode 100644 index e69de29bb2d..00000000000