diff options
Diffstat (limited to 'tools/Makefile.am')
| -rwxr-xr-x | tools/Makefile.am | 108 |
1 files changed, 48 insertions, 60 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index c82f580d2..d1346cc37 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':$(PATH_TO_ASM) +GLIBJ_CLASSPATH='$(top_builddir)/lib':'$(top_builddir)/lib/glibj.zip':asm # Setup the compiler to use the GNU Classpath library we just build if FOUND_GCJ @@ -21,16 +21,11 @@ endif endif endif -if USE_ASM -javah = gjavah -rmic = grmic -endif - if CREATE_WRAPPERS bin_SCRIPTS = bin_PROGRAMS = gappletviewer gjarsigner gkeytool \ - gjar gnative2ascii gserialver $(javah) grmiregistry \ - gtnameserv gorbd grmid $(rmic) + gjar gnative2ascii gserialver gjavah grmiregistry \ + gtnameserv gorbd grmid grmic AM_CPPFLAGS = -Wall \ -I$(top_srcdir)/include \ @@ -40,81 +35,67 @@ AM_CPPFLAGS = -Wall \ gappletviewer_SOURCES = toolwrapper.c gappletviewer_CFLAGS = \ -DTOOLPACKAGE="\"appletviewer\"" \ - -DTOOLNAME="\"gappletviewer\"" \ - -DASM_JAR="" + -DTOOLNAME="\"gappletviewer\"" gjarsigner_SOURCES = toolwrapper.c gjarsigner_CFLAGS = \ -DTOOLPACKAGE="\"jarsigner\"" \ - -DTOOLNAME="\"gjarsigner\"" \ - -DASM_JAR="" + -DTOOLNAME="\"gjarsigner\"" gkeytool_SOURCES = toolwrapper.c gkeytool_CFLAGS = \ -DTOOLPACKAGE="\"keytool\"" \ - -DTOOLNAME="\"gkeytool\"" \ - -DASM_JAR="" + -DTOOLNAME="\"gkeytool\"" gjar_SOURCES = toolwrapper.c gjar_CFLAGS = \ -DTOOLPACKAGE="\"jar\"" \ - -DTOOLNAME="\"gjar\"" \ - -DASM_JAR="" + -DTOOLNAME="\"gjar\"" gnative2ascii_SOURCES = toolwrapper.c gnative2ascii_CFLAGS = \ -DTOOLPACKAGE="\"native2ascii\"" \ - -DTOOLNAME="\"gnative2ascii\"" \ - -DASM_JAR="" + -DTOOLNAME="\"gnative2ascii\"" gserialver_SOURCES = toolwrapper.c gserialver_CFLAGS = \ -DTOOLPACKAGE="\"serialver\"" \ - -DTOOLNAME="\"gserialver\"" \ - -DASM_JAR="" + -DTOOLNAME="\"gserialver\"" grmiregistry_SOURCES = toolwrapper.c grmiregistry_CFLAGS = \ -DTOOLPACKAGE="\"rmiregistry\"" \ - -DTOOLNAME="\"grmiregistry\"" \ - -DASM_JAR="" + -DTOOLNAME="\"grmiregistry\"" gtnameserv_SOURCES = toolwrapper.c gtnameserv_CFLAGS = \ -DTOOLPACKAGE="\"tnameserv\"" \ - -DTOOLNAME="\"gtnameserv\"" \ - -DASM_JAR="" + -DTOOLNAME="\"gtnameserv\"" gorbd_SOURCES = toolwrapper.c gorbd_CFLAGS = \ -DTOOLPACKAGE="\"orbd\"" \ - -DTOOLNAME="\"gorbd\"" \ - -DASM_JAR="" + -DTOOLNAME="\"gorbd\"" grmid_SOURCES = toolwrapper.c grmid_CFLAGS = \ -DTOOLPACKAGE="\"rmid\"" \ - -DTOOLNAME="\"grmid\"" \ - -DASM_JAR="" + -DTOOLNAME="\"grmid\"" -if USE_ASM gjavah_SOURCES = toolwrapper.c gjavah_CFLAGS = \ -DTOOLPACKAGE="\"javah\"" \ - -DTOOLNAME="\"gjavah\"" \ - -DASM_JAR="\":$(PATH_TO_ASM)\"" + -DTOOLNAME="\"gjavah\"" grmic_SOURCES = toolwrapper.c grmic_CFLAGS = \ -DTOOLPACKAGE="\"rmic\"" \ - -DTOOLNAME="\"grmic\"" \ - -DASM_JAR="\":$(PATH_TO_ASM)\"" -endif + -DTOOLNAME="\"grmic\"" else bin_SCRIPTS = gappletviewer gjarsigner gkeytool \ - gjar gnative2ascii gserialver $(javah) grmiregistry \ - gtnameserv gorbd grmid $(rmic) + gjar gnative2ascii gserialver gjavah grmiregistry \ + gtnameserv gorbd grmid grmic bin_PROGRAMS = endif EXTRA_DIST = toolwrapper.c gappletviewer.in gjarsigner.in gkeytool.in \ @@ -122,7 +103,17 @@ EXTRA_DIST = toolwrapper.c gappletviewer.in gjarsigner.in gkeytool.in \ gtnameserv.in gorbd.in grmid.in grmic.in # All our example java source files -TOOLS_JAVA_FILES = $(srcdir)/gnu/classpath/tools/*/*.java +TOOLS_JAVA_FILES = $(srcdir)/gnu/classpath/tools/*/*.java \ + $(srcdir)/external/asm/org/objectweb/asm/*.java \ + $(srcdir)/external/asm/org/objectweb/asm/attrs/*.java \ + $(srcdir)/external/asm/org/objectweb/asm/commons/*.java \ + $(srcdir)/external/asm/org/objectweb/asm/optimizer/*.java \ + $(srcdir)/external/asm/org/objectweb/asm/signature/*.java \ + $(srcdir)/external/asm/org/objectweb/asm/tree/*.java \ + $(srcdir)/external/asm/org/objectweb/asm/tree/analysis/*.java \ + $(srcdir)/external/asm/org/objectweb/asm/util/*.java \ + $(srcdir)/external/asm/org/objectweb/asm/util/attrs/*.java \ + $(srcdir)/external/asm/org/objectweb/asm/xml/*.java # The zip files with classes we want to produce. TOOLS_ZIP = tools.zip @@ -161,35 +152,32 @@ dist-hook: # immediately. And copy the template files we use to the classes dir # so they get also included. $(TOOLS_ZIP): $(TOOLS_JAVA_FILES) - mkdir -p classes/gnu/classpath/tools/appletviewer - mkdir -p classes/gnu/classpath/tools/common - mkdir -p classes/gnu/classpath/tools/getopt - mkdir -p classes/gnu/classpath/tools/jar - mkdir -p classes/gnu/classpath/tools/jarsigner - mkdir -p classes/gnu/classpath/tools/keytool - mkdir -p classes/gnu/classpath/tools/native2ascii - mkdir -p classes/gnu/classpath/tools/orbd - mkdir -p classes/gnu/classpath/tools/rmid - mkdir -p classes/gnu/classpath/tools/rmiregistry - mkdir -p classes/gnu/classpath/tools/serialver - mkdir -p classes/gnu/classpath/tools/tnameserv + @rm -rf classes asm + mkdir classes asm +## Compile ASM separately as it is latin-1 encoded. + find $(srcdir)/external/asm -name '*.java' -print > asm.lst + AC=`echo $(JCOMPILER) | sed -e 's/UTF-8/ISO-8859-1/g'`; \ + $$AC -d asm @asm.lst 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; \ - mv classes.lst classes.tmp; \ - fgrep -v /rmic/ classes.tmp > classes.lst; \ - rm -f classes.tmp;\ - else \ - mkdir -p classes/gnu/classpath/tools/javah; \ - mkdir -p classes/gnu/classpath/tools/rmic/templates; \ - cp $(RMIC_TEMPLATES) classes/gnu/classpath/tools/rmic/templates; \ - fi $(JCOMPILER) -d classes @classes.lst +## Copy over tools resource files. + @list=`cd $(top_srcdir)/resource && find gnu/classpath/tools -name \*.properties -print`; \ + for p in $$list; do \ + dirname=classes/`dirname $$p`; \ + if ! test -d "$$dirname"; then mkdir -p "$$dirname"; fi; \ + echo " cp $(top_srcdir)/resource/$$p classes/$$p"; \ + cp $(top_srcdir)/resource/$$p classes/$$p; \ + done +## First add classpath tools stuff. (cd classes; \ if test "$(ZIP)" != ""; then $(ZIP) -r ../$(TOOLS_ZIP) .; fi; \ if test "$(FASTJAR)" != ""; then $(FASTJAR) cf ../$(TOOLS_ZIP) .; fi; \ cd ..) +## Now add ASM classes. + (cd asm; \ + if test "$(ZIP)" != ""; then $(ZIP) -u -r ../$(TOOLS_ZIP) .; fi; \ + if test "$(FASTJAR)" != ""; then $(FASTJAR) uf ../$(TOOLS_ZIP) .; fi; \ + cd ..) rm -rf classes classes.lst # Zip file be gone! (and make sure the classes are gone too) |