diff options
Diffstat (limited to 'tools/Makefile.am')
| -rwxr-xr-x | tools/Makefile.am | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 37f2c7acd..2c1ceacce 100755 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,6 +1,6 @@ ## Input file for automake to generate the Makefile.in used by configure -GLIBJ_CLASSPATH='$(top_builddir)/lib':'$(top_builddir)/lib/glibj.zip' +GLIBJ_CLASSPATH='$(top_builddir)/lib':'$(top_builddir)/lib/glibj.zip':$(PATH_TO_ASM) # Setup the compiler to use the GNU Classpath library we just build if FOUND_GCJX @@ -13,10 +13,14 @@ error dunno how to setup the JCOMPILER and compile endif endif +if USE_ASM +javah = gjavah +endif + if CREATE_WRAPPERS bin_SCRIPTS = bin_PROGRAMS = gappletviewer gjarsigner gkeytool \ - gjar gnative2ascii gserialver + gjar gnative2ascii gserialver $(javah) #if FOUND_GCJ #LIBJVM = -lgcj @@ -68,13 +72,21 @@ gserialver_CFLAGS = \ -DTOOLNAME="\"gserialver\"" gserialver_LDFLAGS = -L$(libdir) $(LIBJVM) +if USE_ASM +gjavah_SOURCES = toolwrapper.c +gjavah_CFLAGS = \ + -DTOOLPACKAGE="\"javah\"" \ + -DTOOLNAME="\"gjavah\"" +gjavah_LDFLAGS = -L$(libdir) $(LIBJVM) +endif + else bin_SCRIPTS = gappletviewer gjarsigner gkeytool \ - gjar gnative2ascii gserialver + gjar gnative2ascii gserialver $(javah) bin_PROGRAMS = endif EXTRA_DIST = toolwrapper.c gappletviewer.in gjarsigner.in gkeytool.in \ - gjar.in gnative2ascii.in gserialver.in + gjar.in gnative2ascii.in gserialver.in gjavah.in # All our example java source files TOOLS_JAVA_FILES = $(srcdir)/gnu/classpath/tools/*.java $(srcdir)/gnu/classpath/tools/*/*.java $(srcdir)/gnu/classpath/tools/*/*/*.java @@ -137,12 +149,18 @@ $(TOOLS_ZIP): $(TOOLS_JAVA_FILES) cp $(GRMIC_TEMPLATES) classes/gnu/classpath/tools/giop/grmic/templates cp $(RMI_HELPS) classes/gnu/classpath/tools/rmi/ cp $(GIOP_HELPS) classes/gnu/classpath/tools/giop/ - $(JCOMPILER) -d classes $(TOOLS_JAVA_FILES) + find $(srcdir)/gnu/classpath/tools -name '*.java' -print > classes.lst + if test -z "$(PATH_TO_ASM)"; then \ + mv classes.lst classes.tmp; \ + fgrep -v /javah/ classes.tmp > classes.lst; \ + rm -f classes.tmp;\ + fi + $(JCOMPILER) -d classes @classes.lst (cd classes; \ if test "$(ZIP)" != ""; then $(ZIP) -r ../$(TOOLS_ZIP) .; fi; \ if test "$(FASTJAR)" != ""; then $(FASTJAR) cf ../$(TOOLS_ZIP) .; fi; \ cd ..) - rm -rf classes + rm -rf classes classes.lst # Zip file be gone! (and make sure the classes are gone too) clean-local: |