diff options
Diffstat (limited to 'gcc/java/Make-lang.in')
-rw-r--r-- | gcc/java/Make-lang.in | 145 |
1 files changed, 74 insertions, 71 deletions
diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index fc0e40b5161..0dd118638a4 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -139,7 +139,8 @@ jv-scan$(exeext): $(JVSCAN_OBJS) $(LIBDEPS) jcf-dump$(exeext): $(JCFDUMP_OBJS) $(LIBDEPS) rm -f $@ - $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JCFDUMP_OBJS) $(ZLIB) $(LIBS) + $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JCFDUMP_OBJS) \ + $(ZLIB) $(LDEXP_LIB) $(LIBS) jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS) rm -f $@ @@ -170,53 +171,54 @@ java.install-normal: java.install-common: installdirs -if [ -f $(GCJ)$(exeext) ]; then \ if [ -f $(GCJ)-cross$(exeext) ]; then \ - rm -f $(bindir)/$(JAVA_CROSS_NAME)$(exeext); \ - $(INSTALL_PROGRAM) $(GCJ)-cross$(exeext) $(bindir)/$(JAVA_CROSS_NAME)$(exeext); \ - chmod a+x $(bindir)/$(JAVA_CROSS_NAME)$(exeext); \ + rm -f $(DESTDIR)$(bindir)/$(JAVA_CROSS_NAME)$(exeext); \ + $(INSTALL_PROGRAM) $(GCJ)-cross$(exeext) $(DESTDIR)$(bindir)/$(JAVA_CROSS_NAME)$(exeext); \ + chmod a+x $(DESTDIR)$(bindir)/$(JAVA_CROSS_NAME)$(exeext); \ else \ - rm -f $(bindir)/$(JAVA_INSTALL_NAME)$(exeext); \ - $(INSTALL_PROGRAM) $(GCJ)$(exeext) $(bindir)/$(JAVA_INSTALL_NAME)$(exeext); \ - chmod a+x $(bindir)/$(JAVA_INSTALL_NAME)$(exeext); \ - rm -f $(bindir)/$(JAVA_TARGET_INSTALL_NAME)$(exeext); \ - $(LN) $(bindir)/$(JAVA_INSTALL_NAME)$(exeext) $(bindir)/$(JAVA_TARGET_INSTALL_NAME)$(exeext); \ + rm -f $(DESTDIR)$(bindir)/$(JAVA_INSTALL_NAME)$(exeext); \ + $(INSTALL_PROGRAM) $(GCJ)$(exeext) $(DESTDIR)$(bindir)/$(JAVA_INSTALL_NAME)$(exeext); \ + chmod a+x $(DESTDIR)$(bindir)/$(JAVA_INSTALL_NAME)$(exeext); \ + rm -f $(DESTDIR)$(bindir)/$(JAVA_TARGET_INSTALL_NAME)$(exeext); \ + ( cd $(DESTDIR)$(bindir) && \ + $(LN) $(JAVA_INSTALL_NAME)$(exeext) $(JAVA_TARGET_INSTALL_NAME)$(exeext) ); \ fi ; \ fi ; \ for tool in $(JAVA_TARGET_INDEPENDENT_BIN_TOOLS); do \ tool_transformed_name=`echo $$tool|sed '$(program_transform_name)'`; \ if [ -f $$tool$(exeext) ]; then \ - rm -f $(bindir)/$$tool_transformed_name$(exeext); \ - $(INSTALL_PROGRAM) $$tool$(exeext) $(bindir)/$$tool_transformed_name$(exeext); \ - chmod a+x $(bindir)/$$tool_transformed_name$(exeext); \ + rm -f $(DESTDIR)$(bindir)/$$tool_transformed_name$(exeext); \ + $(INSTALL_PROGRAM) $$tool$(exeext) $(DESTDIR)$(bindir)/$$tool_transformed_name$(exeext); \ + chmod a+x $(DESTDIR)$(bindir)/$$tool_transformed_name$(exeext); \ fi ; \ done java.install-man: java.uninstall: - -rm -rf $(bindir)/$(JAVA_INSTALL_NAME)$(exeext) - -rm -rf $(bindir)/$(JAVA_CROSS_NAME)$(exeext) - -rm -rf $(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext) - -rm -rf $(man1dir)/$(JAVA_CROSS_NAME)$(man1ext) - -rm -rf $(man1dir)/gcjh$(man1ext) - -rm -rf $(man1dir)/jv-scan$(man1ext) - -rm -rf $(man1dir)/jcf-dump$(man1ext) - -rm -rf $(man1dir)/gij$(man1ext) - -rm -rf $(man1dir)/jv-convert$(man1ext) + -rm -rf $(DESTDIR)$(bindir)/$(JAVA_INSTALL_NAME)$(exeext) + -rm -rf $(DESTDIR)$(bindir)/$(JAVA_CROSS_NAME)$(exeext) + -rm -rf $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext) + -rm -rf $(DESTDIR)$(man1dir)/$(JAVA_CROSS_NAME)$(man1ext) + -rm -rf $(DESTDIR)$(man1dir)/gcjh$(man1ext) + -rm -rf $(DESTDIR)$(man1dir)/jv-scan$(man1ext) + -rm -rf $(DESTDIR)$(man1dir)/jcf-dump$(man1ext) + -rm -rf $(DESTDIR)$(man1dir)/gij$(man1ext) + -rm -rf $(DESTDIR)$(man1dir)/jv-convert$(man1ext) java.install-info: installdirs if [ -f jc1$(exeext) ] ; then \ if [ -f $(srcdir)/java/gcj.info ]; then \ - rm -f $(infodir)/gcj.info*; \ + rm -f $(DESTDIR)$(infodir)/gcj.info*; \ for f in $(srcdir)/java/gcj.info*; do \ realfile=`echo $$f | sed -e 's|.*/\([^/]*\)$$|\1|'`; \ - $(INSTALL_DATA) $$f $(infodir)/$$realfile; \ + $(INSTALL_DATA) $$f $(DESTDIR)$(infodir)/$$realfile; \ done; \ - chmod a-x $(infodir)/gcj.info*; \ + chmod a-x $(DESTDIR)$(infodir)/gcj.info*; \ else true; fi; \ else true; fi - -if [ -f jc1$(exeext) ] && [ -f $(infodir)/gcj.info ]; then \ + -if [ -f jc1$(exeext) ] && [ -f $(DESTDIR)$(infodir)/gcj.info ]; then \ if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ - install-info --dir-file=$(infodir)/dir $(infodir)/gcj.info; \ + install-info --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/gcj.info; \ else true; fi; \ else true; fi @@ -336,104 +338,105 @@ java/jcf-path.o: java/jcf-path.c $(CONFIG_H) $(SYSTEM_H) java/jcf.h # Documentation $(srcdir)/java/gcj.info: $(srcdir)/java/gcj.texi \ - $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gpl.texi + $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gpl.texi \ + $(srcdir)/doc/include/gcc-common.texi if test "x$(BUILD_INFO)" = xinfo; then \ rm -f $(srcdir)/java/gcc.info*; \ cd $(srcdir)/java && $(MAKEINFO) -I../doc/include -o gcj.info gcj.texi; \ else true; fi java/gcj.dvi: $(srcdir)/java/gcj.texi $(srcdir)/doc/include/fdl.texi \ - $(srcdir)/doc/include/gpl.texi + $(srcdir)/doc/include/gpl.texi $(srcdir)/doc/include/gcc-common.texi s=`cd $(srcdir); ${PWD}`; export s; \ cd java && $(TEXI2DVI) -I $$s/doc/include $$s/java/gcj.texi $(srcdir)/java/gcj.1: $(srcdir)/java/gcj.texi -$(TEXI2POD) -D gcj < $(srcdir)/java/gcj.texi > java/gcj.pod - ($(POD2MAN) --section=1 java/gcj.pod > java/gcj.1.T$$$$ && \ + -($(POD2MAN) --section=1 java/gcj.pod > java/gcj.1.T$$$$ && \ mv -f java/gcj.1.T$$$$ $(srcdir)/java/gcj.1) || \ (rm -f java/gcj.1.T$$$$ && exit 1) - rm -f java/gcj.pod + -rm -f java/gcj.pod $(srcdir)/java/gcjh.1: $(srcdir)/java/gcj.texi -$(TEXI2POD) -D gcjh < $(srcdir)/java/gcj.texi > java/gcjh.pod - ($(POD2MAN) --section=1 java/gcjh.pod > java/gcjh.1.T$$$$ && \ + -($(POD2MAN) --section=1 java/gcjh.pod > java/gcjh.1.T$$$$ && \ mv -f java/gcjh.1.T$$$$ $(srcdir)/java/gcjh.1) || \ (rm -f java/gcjh.1.T$$$$ && exit 1) - rm -f java/gcjh.pod + -rm -f java/gcjh.pod $(srcdir)/java/jv-scan.1: $(srcdir)/java/gcj.texi -$(TEXI2POD) -D jv-scan < $(srcdir)/java/gcj.texi > java/jv-scan.pod - ($(POD2MAN) --section=1 java/jv-scan.pod > java/jv-scan.1.T$$$$ && \ + -($(POD2MAN) --section=1 java/jv-scan.pod > java/jv-scan.1.T$$$$ && \ mv -f java/jv-scan.1.T$$$$ $(srcdir)/java/jv-scan.1) || \ (rm -f java/jv-scan.1.T$$$$ && exit 1) - rm -f java/jv-scan.pod + -rm -f java/jv-scan.pod $(srcdir)/java/jcf-dump.1: $(srcdir)/java/gcj.texi -$(TEXI2POD) -D jcf-dump < $(srcdir)/java/gcj.texi > java/jcf-dump.pod - ($(POD2MAN) --section=1 java/jcf-dump.pod > java/jcf-dump.1.T$$$$ && \ + -($(POD2MAN) --section=1 java/jcf-dump.pod > java/jcf-dump.1.T$$$$ && \ mv -f java/jcf-dump.1.T$$$$ $(srcdir)/java/jcf-dump.1) || \ (rm -f java/jcf-dump.1.T$$$$ && exit 1) - rm -f java/jcf-dump.pod + -rm -f java/jcf-dump.pod $(srcdir)/java/gij.1: $(srcdir)/java/gcj.texi -$(TEXI2POD) -D gij < $(srcdir)/java/gcj.texi > java/gij.pod - ($(POD2MAN) --section=1 java/gij.pod > java/gij.1.T$$$$ && \ + -($(POD2MAN) --section=1 java/gij.pod > java/gij.1.T$$$$ && \ mv -f java/gij.1.T$$$$ $(srcdir)/java/gij.1) || \ (rm -f java/gij.1.T$$$$ && exit 1) - rm -f java/gij.pod + -rm -f java/gij.pod $(srcdir)/java/jv-convert.1: $(srcdir)/java/gcj.texi -$(TEXI2POD) -D jv-convert < $(srcdir)/java/gcj.texi > java/jv-convert.pod - ($(POD2MAN) --section=1 java/jv-convert.pod > java/jv-convert.1.T$$$$ && \ + -($(POD2MAN) --section=1 java/jv-convert.pod > java/jv-convert.1.T$$$$ && \ mv -f java/jv-convert.1.T$$$$ $(srcdir)/java/jv-convert.1) || \ (rm -f java/jv-convert.1.T$$$$ && exit 1) - rm -f java/jv-convert.pod + -rm -f java/jv-convert.pod $(srcdir)/java/rmic.1: $(srcdir)/java/gcj.texi -$(TEXI2POD) -D rmic < $(srcdir)/java/gcj.texi > java/rmic.pod - ($(POD2MAN) --section=1 java/rmic.pod > java/rmic.1.T$$$$ && \ + -($(POD2MAN) --section=1 java/rmic.pod > java/rmic.1.T$$$$ && \ mv -f java/rmic.1.T$$$$ $(srcdir)/java/rmic.1) || \ (rm -f java/rmic.1.T$$$$ && exit 1) - rm -f java/rmic.pod + -rm -f java/rmic.pod $(srcdir)/java/rmiregistry.1: $(srcdir)/java/gcj.texi -$(TEXI2POD) -D rmiregistry < $(srcdir)/java/gcj.texi > java/rmiregistry.pod - ($(POD2MAN) --section=1 java/rmiregistry.pod > java/rmiregistry.1.T$$$$ && \ + -($(POD2MAN) --section=1 java/rmiregistry.pod > java/rmiregistry.1.T$$$$ && \ mv -f java/rmiregistry.1.T$$$$ $(srcdir)/java/rmiregistry.1) || \ (rm -f java/rmiregistry.1.T$$$$ && exit 1) - rm -f java/rmiregistry.pod + -rm -f java/rmiregistry.pod # Install the man pages. java.install-man: installdirs $(GENERATED_JAVA_MANPAGES) -if [ -f $(GCJ)$(exeext) ]; then \ if [ -f $(GCJ)-cross$(exeext) ]; then \ - rm -f $(man1dir)/$(JAVA_CROSS_NAME)$(man1ext); \ - $(INSTALL_DATA) $(srcdir)/java/gcj.1 $(man1dir)/$(JAVA_CROSS_NAME)$(man1ext); \ - chmod a-x $(man1dir)/$(JAVA_CROSS_NAME)$(man1ext); \ + rm -f $(DESTDIR)$(man1dir)/$(JAVA_CROSS_NAME)$(man1ext); \ + $(INSTALL_DATA) $(srcdir)/java/gcj.1 $(DESTDIR)$(man1dir)/$(JAVA_CROSS_NAME)$(man1ext); \ + chmod a-x $(DESTDIR)$(man1dir)/$(JAVA_CROSS_NAME)$(man1ext); \ else \ - rm -f $(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext); \ - $(INSTALL_DATA) $(srcdir)/java/gcj.1 $(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext); \ - chmod a-x $(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext); \ + rm -f $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext); \ + $(INSTALL_DATA) $(srcdir)/java/gcj.1 $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext); \ + chmod a-x $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext); \ fi ; \ fi - -rm -f $(man1dir)/gcjh$(man1ext) - -$(INSTALL_DATA) $(srcdir)/java/gcjh.1 $(man1dir)/gcjh$(man1ext) - -chmod a-x $(man1dir)/gcjh$(man1ext) - -rm -f $(man1dir)/jv-scan$(man1ext) - -$(INSTALL_DATA) $(srcdir)/java/jv-scan.1 $(man1dir)/jv-scan$(man1ext) - -chmod a-x $(man1dir)/jv-scan$(man1ext) - -rm -f $(man1dir)/jcf-dump$(man1ext) - -$(INSTALL_DATA) $(srcdir)/java/jcf-dump.1 $(man1dir)/jcf-dump$(man1ext) - -chmod a-x $(man1dir)/jcf-dump$(man1ext) - -rm -f $(man1dir)/gij$(man1ext) - -$(INSTALL_DATA) $(srcdir)/java/gij.1 $(man1dir)/gij$(man1ext) - -chmod a-x $(man1dir)/gij$(man1ext) - -rm -f $(man1dir)/jv-convert$(man1ext) - -$(INSTALL_DATA) $(srcdir)/java/jv-convert.1 $(man1dir)/jv-convert$(man1ext) - -chmod a-x $(man1dir)/jv-convert$(man1ext) - -rm -f $(man1dir)/rmic$(man1ext) - -$(INSTALL_DATA) $(srcdir)/java/rmic.1 $(man1dir)/rmic$(man1ext) - -chmod a-x $(man1dir)/rmic$(man1ext) - -rm -f $(man1dir)/rmiregistry$(man1ext) - -$(INSTALL_DATA) $(srcdir)/java/rmiregistry.1 $(man1dir)/rmiregistry$(man1ext) - -chmod a-x $(man1dir)/rmiregistry$(man1ext) + -rm -f $(DESTDIR)$(man1dir)/gcjh$(man1ext) + -$(INSTALL_DATA) $(srcdir)/java/gcjh.1 $(DESTDIR)$(man1dir)/gcjh$(man1ext) + -chmod a-x $(DESTDIR)$(man1dir)/gcjh$(man1ext) + -rm -f $(DESTDIR)$(man1dir)/jv-scan$(man1ext) + -$(INSTALL_DATA) $(srcdir)/java/jv-scan.1 $(DESTDIR)$(man1dir)/jv-scan$(man1ext) + -chmod a-x $(DESTDIR)$(man1dir)/jv-scan$(man1ext) + -rm -f $(DESTDIR)$(man1dir)/jcf-dump$(man1ext) + -$(INSTALL_DATA) $(srcdir)/java/jcf-dump.1 $(DESTDIR)$(man1dir)/jcf-dump$(man1ext) + -chmod a-x $(DESTDIR)$(man1dir)/jcf-dump$(man1ext) + -rm -f $(DESTDIR)$(man1dir)/gij$(man1ext) + -$(INSTALL_DATA) $(srcdir)/java/gij.1 $(DESTDIR)$(man1dir)/gij$(man1ext) + -chmod a-x $(DESTDIR)$(man1dir)/gij$(man1ext) + -rm -f $(DESTDIR)$(man1dir)/jv-convert$(man1ext) + -$(INSTALL_DATA) $(srcdir)/java/jv-convert.1 $(DESTDIR)$(man1dir)/jv-convert$(man1ext) + -chmod a-x $(DESTDIR)$(man1dir)/jv-convert$(man1ext) + -rm -f $(DESTDIR)$(man1dir)/rmic$(man1ext) + -$(INSTALL_DATA) $(srcdir)/java/rmic.1 $(DESTDIR)$(man1dir)/rmic$(man1ext) + -chmod a-x $(DESTDIR)$(man1dir)/rmic$(man1ext) + -rm -f $(DESTDIR)$(man1dir)/rmiregistry$(man1ext) + -$(INSTALL_DATA) $(srcdir)/java/rmiregistry.1 $(DESTDIR)$(man1dir)/rmiregistry$(man1ext) + -chmod a-x $(DESTDIR)$(man1dir)/rmiregistry$(man1ext) |