diff options
| author | Brian Jones <cbj@gnu.org> | 2000-11-20 00:13:17 +0000 |
|---|---|---|
| committer | Brian Jones <cbj@gnu.org> | 2000-11-20 00:13:17 +0000 |
| commit | f38f65f563537737e92224739212fa6e301d5d46 (patch) | |
| tree | c54cedb0d2e5c035dd83a002b88dc6afdc2da153 /lib | |
| parent | a10c273a98f366363c56c157055c6e42f7ae8c56 (diff) | |
| download | classpath-f38f65f563537737e92224739212fa6e301d5d46.tar.gz | |
Makefile.am: removed +M for jikes compilation
changed HEADERS to CP_HEADERS due to a conflicting autoconf variable
auto-included in the dist target
put glibj.zip back into the dist target
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index e90093dd8..715541eb9 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -109,7 +109,7 @@ else if USER_SPECIFIED_JIKES if USER_SPECIFIED_CLASSLIB -JAVAC = @JIKES@ -nowarn +CSO +M +F $(ARG_CLASSPATH_JAVAC) ..:../vm/current:.:@USER_CLASSLIB@ -d . @classes +JAVAC = @JIKES@ -nowarn +CSO +F $(ARG_CLASSPATH_JAVAC) ..:../vm/current:.:@USER_CLASSLIB@ -d . @classes else JAVAC = @JIKES@ -nowarn +CSO +M +F $(ARG_CLASSPATH_JAVAC) ..:../vm/current:. -d . @classes endif @@ -182,16 +182,16 @@ endif JAVAH = $(USER_JAVAH) $(ARG_JNI_JAVAH) $(ARG_CLASSPATH_JAVAH) .:$(USER_CLASSLIB) -#pkgdata_DATA = glibj.zip +pkgdata_DATA = glibj.zip install-data-local : if ! [ -e $(pkgdatadir) ]; then mkdir -p $(pkgdatadir); fi unzip -d $(pkgdatadir) glibj.zip -all: $(HEADERS_DEPEND) glibj.zip $(HEADERS) +all: $(HEADERS_DEPEND) glibj.zip $(CP_HEADERS) #jar-classes # this makes headers always generate after making glibj.zip -# $(HEADERS) : glibj.zip +$(CP_HEADERS) : headers.dep #.PHONY: jar-classes glibj.zip: classes compile-classes $(MAKEFILE_DEPEND) @@ -262,7 +262,7 @@ $(JAVA_DEPEND): classes EXTRA_DIST = glibj.zip standard.omit ## not sure if we want to let the user easily get rid of glibj.zip ## CLEANFILES = glibj.zip -DISTCLEANFILES = $(CLASSES) $(HEADERS) +DISTCLEANFILES = $(CLASSES) $(CP_HEADERS) MAINTAINERCLEANFILES = makefile.dep $(JAVA_DEPEND) $(HEADERS_DEPEND) maintainer-clean-local: |