OSDN Git Service

2004-04-10 Kelley Cook <kcook@gcc.gnu.org>
[pf3gnuchains/gcc-fork.git] / zlib / Makefile.in
index e4c116e..117d1e6 100644 (file)
@@ -83,7 +83,10 @@ PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 STRIP = @STRIP@
 VERSION = @VERSION@
+mkinstalldirs = @mkinstalldirs@
 target_all = @target_all@
+toolexecdir = @toolexecdir@
+toolexeclibdir = @toolexeclibdir@
 zlib_basedir = @zlib_basedir@
 
 AUTOMAKE_OPTIONS = cygnus
@@ -95,9 +98,6 @@ MULTIDIRS =
 MULTISUBDIR = 
 MULTIDO = true
 MULTICLEAN = true
-@USE_LIBDIR_TRUE@toolexeclibdir = @USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR)
-@USE_LIBDIR_FALSE@toolexeclibdir = @USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR)
-@USE_LIBDIR_FALSE@toolexecdir = @USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias)
 
 ZLIB_SOURCES = adler32.c compress.c crc32.c deflate.c deflate.h \
 gzio.c infblock.c infblock.h infcodes.c infcodes.h inffast.c inffast.h \
@@ -105,10 +105,8 @@ inffixed.h inflate.c inftrees.c inftrees.h infutil.c infutil.h trees.c \
 trees.h uncompr.c zconf.h zlib.h zutil.c zutil.h
 
 
-@TARGET_LIBRARY_TRUE@toolexeclib_LTLIBRARIES = @TARGET_LIBRARY_TRUE@@target_all@
-@TARGET_LIBRARY_TRUE@EXTRA_LTLIBRARIES = @TARGET_LIBRARY_TRUE@libzgcj.la
-@TARGET_LIBRARY_TRUE@libzgcj_la_SOURCES = @TARGET_LIBRARY_TRUE@$(ZLIB_SOURCES)
-@TARGET_LIBRARY_TRUE@libzgcj_la_LDFLAGS = @TARGET_LIBRARY_TRUE@-version-info 0:0:0 -rpath $(toolexeclibdir)
+@TARGET_LIBRARY_TRUE@noinst_LTLIBRARIES = @TARGET_LIBRARY_TRUE@libzgcj_convenience.la
+@TARGET_LIBRARY_TRUE@libzgcj_convenience_la_SOURCES = @TARGET_LIBRARY_TRUE@$(ZLIB_SOURCES)
 @TARGET_LIBRARY_FALSE@toolexeclib_LIBRARIES = @TARGET_LIBRARY_FALSE@libz.a
 @TARGET_LIBRARY_FALSE@libz_a_SOURCES = @TARGET_LIBRARY_FALSE@$(ZLIB_SOURCES)
 
@@ -154,7 +152,6 @@ AM_MAKEFLAGS = \
        "DESTDIR=$(DESTDIR)"
 
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
 CONFIG_CLEAN_FILES = 
 LIBRARIES =  $(toolexeclib_LIBRARIES)
 
@@ -172,45 +169,47 @@ libz_a_LIBADD =
 @TARGET_LIBRARY_FALSE@inftrees.$(OBJEXT) infutil.$(OBJEXT) \
 @TARGET_LIBRARY_FALSE@trees.$(OBJEXT) uncompr.$(OBJEXT) zutil.$(OBJEXT)
 AR = ar
-LTLIBRARIES =  $(toolexeclib_LTLIBRARIES)
-
-libzgcj_la_LIBADD = 
-@TARGET_LIBRARY_TRUE@libzgcj_la_OBJECTS =  adler32.lo compress.lo \
-@TARGET_LIBRARY_TRUE@crc32.lo deflate.lo gzio.lo infblock.lo \
-@TARGET_LIBRARY_TRUE@infcodes.lo inffast.lo inflate.lo inftrees.lo \
-@TARGET_LIBRARY_TRUE@infutil.lo trees.lo uncompr.lo zutil.lo
+LTLIBRARIES =  $(noinst_LTLIBRARIES)
+
+libzgcj_convenience_la_LDFLAGS = 
+libzgcj_convenience_la_LIBADD = 
+@TARGET_LIBRARY_TRUE@libzgcj_convenience_la_OBJECTS =  adler32.lo \
+@TARGET_LIBRARY_TRUE@compress.lo crc32.lo deflate.lo gzio.lo \
+@TARGET_LIBRARY_TRUE@infblock.lo infcodes.lo inffast.lo inflate.lo \
+@TARGET_LIBRARY_TRUE@inftrees.lo infutil.lo trees.lo uncompr.lo \
+@TARGET_LIBRARY_TRUE@zutil.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 DIST_COMMON =  README ChangeLog Makefile.am Makefile.in acinclude.m4 \
-aclocal.m4 configure configure.in
+aclocal.m4 configure configure.ac
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
-SOURCES = $(libz_a_SOURCES) $(libzgcj_la_SOURCES)
-OBJECTS = $(libz_a_OBJECTS) $(libzgcj_la_OBJECTS)
+SOURCES = $(libz_a_SOURCES) $(libzgcj_convenience_la_SOURCES)
+OBJECTS = $(libz_a_OBJECTS) $(libzgcj_convenience_la_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
        cd $(top_builddir) \
          && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  acinclude.m4
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.ac  acinclude.m4
        cd $(srcdir) && $(ACLOCAL)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
        $(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
        cd $(srcdir) && $(AUTOCONF)
 
 mostlyclean-toolexeclibLIBRARIES:
@@ -294,33 +293,17 @@ libz.a: $(libz_a_OBJECTS) $(libz_a_DEPENDENCIES)
        $(AR) cru libz.a $(libz_a_OBJECTS) $(libz_a_LIBADD)
        $(RANLIB) libz.a
 
-mostlyclean-toolexeclibLTLIBRARIES:
-
-clean-toolexeclibLTLIBRARIES:
-       -test -z "$(toolexeclib_LTLIBRARIES)" || rm -f $(toolexeclib_LTLIBRARIES)
-
-distclean-toolexeclibLTLIBRARIES:
+mostlyclean-noinstLTLIBRARIES:
 
-maintainer-clean-toolexeclibLTLIBRARIES:
+clean-noinstLTLIBRARIES:
+       -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
 
-install-toolexeclibLTLIBRARIES: $(toolexeclib_LTLIBRARIES)
-       @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(toolexeclibdir)
-       @list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \
-         if test -f $$p; then \
-           echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(toolexeclibdir)/$$p"; \
-           $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(toolexeclibdir)/$$p; \
-         else :; fi; \
-       done
+distclean-noinstLTLIBRARIES:
 
-uninstall-toolexeclibLTLIBRARIES:
-       @$(NORMAL_UNINSTALL)
-       list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \
-         $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(toolexeclibdir)/$$p; \
-       done
+maintainer-clean-noinstLTLIBRARIES:
 
-libzgcj.la: $(libzgcj_la_OBJECTS) $(libzgcj_la_DEPENDENCIES)
-       $(LINK)  $(libzgcj_la_LDFLAGS) $(libzgcj_la_OBJECTS) $(libzgcj_la_LIBADD) $(LIBS)
+libzgcj_convenience.la: $(libzgcj_convenience_la_OBJECTS) $(libzgcj_convenience_la_DEPENDENCIES)
+       $(LINK)  $(libzgcj_convenience_la_LDFLAGS) $(libzgcj_convenience_la_OBJECTS) $(libzgcj_convenience_la_LIBADD) $(LIBS)
 
 tags: TAGS
 
@@ -409,8 +392,7 @@ installcheck-am:
 installcheck: installcheck-am
 install-info-am: 
 install-info: install-info-am
-install-exec-am: install-toolexeclibLIBRARIES \
-               install-toolexeclibLTLIBRARIES
+install-exec-am: install-toolexeclibLIBRARIES
 install-exec: install-exec-am
 
 install-data-am:
@@ -419,16 +401,14 @@ install-data: install-data-am
 install-am: all-am
        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
-uninstall-am: uninstall-toolexeclibLIBRARIES \
-               uninstall-toolexeclibLTLIBRARIES
+uninstall-am: uninstall-toolexeclibLIBRARIES
 uninstall: uninstall-am
 all-am: Makefile $(LIBRARIES) $(LTLIBRARIES)
 all-redirect: all-am
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs:
-       $(mkinstalldirs)  $(DESTDIR)$(toolexeclibdir) \
-               $(DESTDIR)$(toolexeclibdir)
+       $(mkinstalldirs)  $(DESTDIR)$(toolexeclibdir)
 
 
 mostlyclean-generic:
@@ -441,19 +421,19 @@ distclean-generic:
 
 maintainer-clean-generic:
 mostlyclean-am:  mostlyclean-toolexeclibLIBRARIES mostlyclean-compile \
-               mostlyclean-libtool mostlyclean-toolexeclibLTLIBRARIES \
+               mostlyclean-libtool mostlyclean-noinstLTLIBRARIES \
                mostlyclean-tags mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
 clean-am:  clean-toolexeclibLIBRARIES clean-compile clean-libtool \
-               clean-toolexeclibLTLIBRARIES clean-tags clean-generic \
+               clean-noinstLTLIBRARIES clean-tags clean-generic \
                mostlyclean-am
 
 clean: clean-am
 
 distclean-am:  distclean-toolexeclibLIBRARIES distclean-compile \
-               distclean-libtool distclean-toolexeclibLTLIBRARIES \
+               distclean-libtool distclean-noinstLTLIBRARIES \
                distclean-tags distclean-generic clean-am
        -rm -f libtool
 
@@ -462,7 +442,7 @@ distclean: distclean-am
 
 maintainer-clean-am:  maintainer-clean-toolexeclibLIBRARIES \
                maintainer-clean-compile maintainer-clean-libtool \
-               maintainer-clean-toolexeclibLTLIBRARIES \
+               maintainer-clean-noinstLTLIBRARIES \
                maintainer-clean-tags maintainer-clean-generic \
                distclean-am
        @echo "This command is intended for maintainers to use;"
@@ -476,17 +456,15 @@ clean-toolexeclibLIBRARIES maintainer-clean-toolexeclibLIBRARIES \
 uninstall-toolexeclibLIBRARIES install-toolexeclibLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool \
-mostlyclean-toolexeclibLTLIBRARIES distclean-toolexeclibLTLIBRARIES \
-clean-toolexeclibLTLIBRARIES maintainer-clean-toolexeclibLTLIBRARIES \
-uninstall-toolexeclibLTLIBRARIES install-toolexeclibLTLIBRARIES tags \
-mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
-distdir info-am info dvi-am dvi check check-am installcheck-am \
-installcheck install-info-am install-info install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+clean-libtool maintainer-clean-libtool mostlyclean-noinstLTLIBRARIES \
+distclean-noinstLTLIBRARIES clean-noinstLTLIBRARIES \
+maintainer-clean-noinstLTLIBRARIES tags mostlyclean-tags distclean-tags \
+clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
+check-am installcheck-am installcheck install-info-am install-info \
+install-exec-am install-exec install-data-am install-data install-am \
+install uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
 # Multilib support.
@@ -501,7 +479,7 @@ distclean-am: distclean-multi
 maintainer-clean-am: maintainer-clean-multi
 
 all-multi:
-       $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do
+       : $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do
 install-multi:
        $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do
 mostlyclean-multi: