Makefile.am: Make target library a convenience library.
zlib: * Makefile.am: Make target library a convenience library. * Makefile.in: Rebuilt. libffi: * Makefile.am: libfficonvenience -> libffi_convenience. * Makefile.in: Rebuilt. boehm-gc: * Makefile.am: Make a convenience library. * Makefile.in: Rebuilt. libjava: Build a single libgcj.so, without separate gc and zlib libraries. * configure.in: Use convenience libraries for boehm-gc and zlib. Set SYS_ZLIBS if system zlib is used. * configure: Rebuilt. * Makefile.am: Use boehm-gc and zlib convenience libraries. * Makefile.in: Rebuilt. * libtool-version: Increment .so version number. From-SVN: r50901
This commit is contained in:
Bryce McKinlay
Bryce McKinlay
parent
998747d03b
commit
3e2972b3a4
|
|
@ -21,6 +21,11 @@
|
|||
* include/gc_priv.h: Define ALIGN_DOUBLE on 32 bit targets if GCJ
|
||||
support is enabled, for hash synchronization.
|
||||
|
||||
2002-03-17 Bryce McKinlay <bryce@waitaki.otago.ac.nz>
|
||||
|
||||
* Makefile.am: Make a convenience library.
|
||||
* Makefile.in: Rebuilt.
|
||||
|
||||
2002-02-24 Adam Megacz <adam@xwt.org>
|
||||
|
||||
* Makefile.am: Added win32_threads.c to sources list.
|
||||
|
|
|
|||
|
|
@ -25,25 +25,34 @@ toolexecdir = $(exec_prefix)/$(target_alias)
|
|||
toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR)
|
||||
endif
|
||||
|
||||
toolexeclib_LTLIBRARIES = $(target_all)
|
||||
EXTRA_LTLIBRARIES = libgcjgc.la
|
||||
libgcjgc_la_SOURCES = allchblk.c alloc.c blacklst.c checksums.c dbg_mlc.c \
|
||||
toolexeclib_LTLIBRARIES = libgcjgc.la
|
||||
noinst_LTLIBRARIES = libgcjgc_convenience.la
|
||||
|
||||
GC_SOURCES = allchblk.c alloc.c blacklst.c checksums.c dbg_mlc.c \
|
||||
dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c headers.c irix_threads.c \
|
||||
linux_threads.c malloc.c mallocx.c mark.c mark_rts.c misc.c new_hblk.c \
|
||||
obj_map.c os_dep.c pcr_interface.c ptr_chck.c real_malloc.c reclaim.c \
|
||||
solaris_pthreads.c solaris_threads.c specific.c stubborn.c typd_mlc.c \
|
||||
backgraph.c win32_threads.c
|
||||
|
||||
EXTRA_GC_SOURCES = alpha_mach_dep.s \
|
||||
mips_sgi_mach_dep.S mips_ultrix_mach_dep.s powerpc_macosx_mach_dep.s \
|
||||
rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \
|
||||
sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
|
||||
|
||||
libgcjgc_la_SOURCES = $(GC_SOURCES)
|
||||
libgcjgc_convenience_la_SOURCES = $(GC_SOURCES)
|
||||
EXTRA_libgcjgc_la_SOURCES = $(EXTRA_GC_SOURCES)
|
||||
EXTRA_libgcjgc_convenience_la_SOURCES = $(EXTRA_GC_SOURCES)
|
||||
|
||||
# Include THREADLIBS here to ensure that the correct versions of
|
||||
# linuxthread semaphore functions get linked:
|
||||
libgcjgc_la_LIBADD = @addobjs@ $(THREADLIBS)
|
||||
libgcjgc_la_DEPENDENCIES = @addobjs@
|
||||
libgcjgc_la_LDFLAGS = -version-info 1:1:0 -rpath $(toolexeclibdir)
|
||||
|
||||
EXTRA_libgcjgc_la_SOURCES = alpha_mach_dep.s \
|
||||
mips_sgi_mach_dep.S mips_ultrix_mach_dep.s powerpc_macosx_mach_dep.s \
|
||||
rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \
|
||||
sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
|
||||
libgcjgc_convenience_la_LIBADD = @addobjs@
|
||||
libgcjgc_convenience_la_DEPENDENCIES = @addobjs@
|
||||
|
||||
AM_CXXFLAGS = @GC_CFLAGS@
|
||||
AM_CFLAGS = @GC_CFLAGS@
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
|
||||
# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
|
||||
|
||||
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
|
|
@ -105,14 +105,31 @@ MULTIDIRS =
|
|||
MULTISUBDIR =
|
||||
MULTIDO = true
|
||||
MULTICLEAN = true
|
||||
@USE_LIBDIR_TRUE@toolexeclibdir = $(libdir)$(MULTISUBDIR)
|
||||
@USE_LIBDIR_FALSE@toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR)
|
||||
@USE_LIBDIR_FALSE@toolexecdir = $(exec_prefix)/$(target_alias)
|
||||
@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)
|
||||
|
||||
toolexeclib_LTLIBRARIES = $(target_all)
|
||||
EXTRA_LTLIBRARIES = libgcjgc.la
|
||||
libgcjgc_la_SOURCES = allchblk.c alloc.c blacklst.c checksums.c dbg_mlc.c dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c headers.c irix_threads.c linux_threads.c malloc.c mallocx.c mark.c mark_rts.c misc.c new_hblk.c obj_map.c os_dep.c pcr_interface.c ptr_chck.c real_malloc.c reclaim.c solaris_pthreads.c solaris_threads.c specific.c stubborn.c typd_mlc.c backgraph.c win32_threads.c
|
||||
toolexeclib_LTLIBRARIES = libgcjgc.la
|
||||
noinst_LTLIBRARIES = libgcjgc_convenience.la
|
||||
|
||||
GC_SOURCES = allchblk.c alloc.c blacklst.c checksums.c dbg_mlc.c \
|
||||
dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c headers.c irix_threads.c \
|
||||
linux_threads.c malloc.c mallocx.c mark.c mark_rts.c misc.c new_hblk.c \
|
||||
obj_map.c os_dep.c pcr_interface.c ptr_chck.c real_malloc.c reclaim.c \
|
||||
solaris_pthreads.c solaris_threads.c specific.c stubborn.c typd_mlc.c \
|
||||
backgraph.c win32_threads.c
|
||||
|
||||
|
||||
EXTRA_GC_SOURCES = alpha_mach_dep.s \
|
||||
mips_sgi_mach_dep.S mips_ultrix_mach_dep.s powerpc_macosx_mach_dep.s \
|
||||
rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \
|
||||
sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
|
||||
|
||||
|
||||
libgcjgc_la_SOURCES = $(GC_SOURCES)
|
||||
libgcjgc_convenience_la_SOURCES = $(GC_SOURCES)
|
||||
EXTRA_libgcjgc_la_SOURCES = $(EXTRA_GC_SOURCES)
|
||||
EXTRA_libgcjgc_convenience_la_SOURCES = $(EXTRA_GC_SOURCES)
|
||||
|
||||
# Include THREADLIBS here to ensure that the correct versions of
|
||||
# linuxthread semaphore functions get linked:
|
||||
|
|
@ -120,8 +137,8 @@ libgcjgc_la_LIBADD = @addobjs@ $(THREADLIBS)
|
|||
libgcjgc_la_DEPENDENCIES = @addobjs@
|
||||
libgcjgc_la_LDFLAGS = -version-info 1:1:0 -rpath $(toolexeclibdir)
|
||||
|
||||
EXTRA_libgcjgc_la_SOURCES = alpha_mach_dep.s mips_sgi_mach_dep.S mips_ultrix_mach_dep.s powerpc_macosx_mach_dep.s rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
|
||||
|
||||
libgcjgc_convenience_la_LIBADD = @addobjs@
|
||||
libgcjgc_convenience_la_DEPENDENCIES = @addobjs@
|
||||
|
||||
AM_CXXFLAGS = @GC_CFLAGS@
|
||||
|
||||
|
|
@ -138,14 +155,52 @@ TESTS = gctest
|
|||
|
||||
all_objs = @addobjs@ $(libgcjgc_la_OBJECTS)
|
||||
|
||||
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(MY_CFLAGS) $(GC_CFLAGS)
|
||||
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) \
|
||||
$(AM_CPPFLAGS) $(CPPFLAGS) \
|
||||
$(AM_CFLAGS) $(MY_CFLAGS) $(GC_CFLAGS)
|
||||
|
||||
LINK = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(MY_CFLAGS) $(LDFLAGS) -o $@
|
||||
|
||||
# Work around what appears to be a GNU make bug handling MAKEFLAGS
|
||||
# values defined in terms of make variables, as is the case for CC and
|
||||
# friends when we are called from the top level Makefile.
|
||||
AM_MAKEFLAGS = "AR_FLAGS=$(AR_FLAGS)" "CC_FOR_BUILD=$(CC_FOR_BUILD)" "CFLAGS=$(CFLAGS)" "CXXFLAGS=$(CXXFLAGS)" "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" "INSTALL=$(INSTALL)" "INSTALL_DATA=$(INSTALL_DATA)" "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" "LDFLAGS=$(LDFLAGS)" "LIBCFLAGS=$(LIBCFLAGS)" "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" "MAKE=$(MAKE)" "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" "PICFLAG=$(PICFLAG)" "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" "SHELL=$(SHELL)" "EXPECT=$(EXPECT)" "RUNTEST=$(RUNTEST)" "RUNTESTFLAGS=$(RUNTESTFLAGS)" "exec_prefix=$(exec_prefix)" "infodir=$(infodir)" "libdir=$(libdir)" "prefix=$(prefix)" "tooldir=$(tooldir)" "AR=$(AR)" "AS=$(AS)" "CC=$(CC)" "CXX=$(CXX)" "LD=$(LD)" "LIBCFLAGS=$(LIBCFLAGS)" "NM=$(NM)" "PICFLAG=$(PICFLAG)" "RANLIB=$(RANLIB)" "DESTDIR=$(DESTDIR)"
|
||||
AM_MAKEFLAGS = \
|
||||
"AR_FLAGS=$(AR_FLAGS)" \
|
||||
"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
|
||||
"CFLAGS=$(CFLAGS)" \
|
||||
"CXXFLAGS=$(CXXFLAGS)" \
|
||||
"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
|
||||
"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
|
||||
"INSTALL=$(INSTALL)" \
|
||||
"INSTALL_DATA=$(INSTALL_DATA)" \
|
||||
"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
|
||||
"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
|
||||
"LDFLAGS=$(LDFLAGS)" \
|
||||
"LIBCFLAGS=$(LIBCFLAGS)" \
|
||||
"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
|
||||
"MAKE=$(MAKE)" \
|
||||
"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
|
||||
"PICFLAG=$(PICFLAG)" \
|
||||
"PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
|
||||
"SHELL=$(SHELL)" \
|
||||
"EXPECT=$(EXPECT)" \
|
||||
"RUNTEST=$(RUNTEST)" \
|
||||
"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
|
||||
"exec_prefix=$(exec_prefix)" \
|
||||
"infodir=$(infodir)" \
|
||||
"libdir=$(libdir)" \
|
||||
"prefix=$(prefix)" \
|
||||
"tooldir=$(tooldir)" \
|
||||
"AR=$(AR)" \
|
||||
"AS=$(AS)" \
|
||||
"CC=$(CC)" \
|
||||
"CXX=$(CXX)" \
|
||||
"LD=$(LD)" \
|
||||
"LIBCFLAGS=$(LIBCFLAGS)" \
|
||||
"NM=$(NM)" \
|
||||
"PICFLAG=$(PICFLAG)" \
|
||||
"RANLIB=$(RANLIB)" \
|
||||
"DESTDIR=$(DESTDIR)"
|
||||
|
||||
|
||||
CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host
|
||||
|
|
@ -153,13 +208,21 @@ CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host
|
|||
MAKEOVERRIDES =
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
CONFIG_CLEAN_FILES =
|
||||
LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
|
||||
LTLIBRARIES = $(noinst_LTLIBRARIES) $(toolexeclib_LTLIBRARIES)
|
||||
|
||||
|
||||
DEFS = @DEFS@ -I. -I$(srcdir)
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LIBS = @LIBS@
|
||||
libgcjgc_convenience_la_LDFLAGS =
|
||||
libgcjgc_convenience_la_OBJECTS = allchblk.lo alloc.lo blacklst.lo \
|
||||
checksums.lo dbg_mlc.lo dyn_load.lo finalize.lo gc_dlopen.lo gcj_mlc.lo \
|
||||
headers.lo irix_threads.lo linux_threads.lo malloc.lo mallocx.lo \
|
||||
mark.lo mark_rts.lo misc.lo new_hblk.lo obj_map.lo os_dep.lo \
|
||||
pcr_interface.lo ptr_chck.lo real_malloc.lo reclaim.lo \
|
||||
solaris_pthreads.lo solaris_threads.lo specific.lo stubborn.lo \
|
||||
typd_mlc.lo backgraph.lo win32_threads.lo
|
||||
libgcjgc_la_OBJECTS = allchblk.lo alloc.lo blacklst.lo checksums.lo \
|
||||
dbg_mlc.lo dyn_load.lo finalize.lo gc_dlopen.lo gcj_mlc.lo headers.lo \
|
||||
irix_threads.lo linux_threads.lo malloc.lo mallocx.lo mark.lo \
|
||||
|
|
@ -179,10 +242,10 @@ ltmain.sh mkinstalldirs
|
|||
|
||||
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
||||
TAR = tar
|
||||
TAR = gtar
|
||||
GZIP_ENV = --best
|
||||
SOURCES = $(libgcjgc_la_SOURCES) $(EXTRA_libgcjgc_la_SOURCES)
|
||||
OBJECTS = $(libgcjgc_la_OBJECTS)
|
||||
SOURCES = $(libgcjgc_convenience_la_SOURCES) $(EXTRA_libgcjgc_convenience_la_SOURCES) $(libgcjgc_la_SOURCES) $(EXTRA_libgcjgc_la_SOURCES)
|
||||
OBJECTS = $(libgcjgc_convenience_la_OBJECTS) $(libgcjgc_la_OBJECTS)
|
||||
|
||||
all: all-redirect
|
||||
.SUFFIXES:
|
||||
|
|
@ -197,11 +260,20 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|||
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4
|
||||
cd $(srcdir) && $(ACLOCAL)
|
||||
|
||||
config.status: $(srcdir)/configure.in $(CONFIG_STATUS_DEPENDENCIES)
|
||||
config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
|
||||
$(SHELL) ./config.status --recheck
|
||||
$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
|
||||
cd $(srcdir) && $(AUTOCONF)
|
||||
|
||||
mostlyclean-noinstLTLIBRARIES:
|
||||
|
||||
clean-noinstLTLIBRARIES:
|
||||
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
|
||||
|
||||
distclean-noinstLTLIBRARIES:
|
||||
|
||||
maintainer-clean-noinstLTLIBRARIES:
|
||||
|
||||
mostlyclean-toolexeclibLTLIBRARIES:
|
||||
|
||||
clean-toolexeclibLTLIBRARIES:
|
||||
|
|
@ -268,8 +340,11 @@ distclean-libtool:
|
|||
|
||||
maintainer-clean-libtool:
|
||||
|
||||
libgcjgc_convenience.la: $(libgcjgc_convenience_la_OBJECTS) $(libgcjgc_convenience_la_DEPENDENCIES)
|
||||
$(LINK) $(libgcjgc_convenience_la_LDFLAGS) $(libgcjgc_convenience_la_OBJECTS) $(libgcjgc_convenience_la_LIBADD) $(LIBS)
|
||||
|
||||
libgcjgc.la: $(libgcjgc_la_OBJECTS) $(libgcjgc_la_DEPENDENCIES)
|
||||
$(LINK) $(libgcjgc_la_LDFLAGS) $(libgcjgc_la_OBJECTS) $(libgcjgc_la_LIBADD) $(LIBS)
|
||||
$(LINK) -rpath $(toolexeclibdir) $(libgcjgc_la_LDFLAGS) $(libgcjgc_la_OBJECTS) $(libgcjgc_la_LIBADD) $(LIBS)
|
||||
|
||||
mostlyclean-checkPROGRAMS:
|
||||
|
||||
|
|
@ -320,7 +395,7 @@ maintainer-clean-recursive:
|
|||
dot_seen=no; \
|
||||
rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
|
||||
rev="$$subdir $$rev"; \
|
||||
test "$$subdir" = "." && dot_seen=yes; \
|
||||
test "$$subdir" != "." || dot_seen=yes; \
|
||||
done; \
|
||||
test "$$dot_seen" = "no" && rev=". $$rev"; \
|
||||
target=`echo $@ | sed s/-recursive//`; \
|
||||
|
|
@ -496,19 +571,21 @@ distclean-generic:
|
|||
-rm -f config.cache config.log stamp-h stamp-h[0-9]*
|
||||
|
||||
maintainer-clean-generic:
|
||||
mostlyclean-am: mostlyclean-toolexeclibLTLIBRARIES mostlyclean-compile \
|
||||
mostlyclean-am: mostlyclean-noinstLTLIBRARIES \
|
||||
mostlyclean-toolexeclibLTLIBRARIES mostlyclean-compile \
|
||||
mostlyclean-libtool mostlyclean-checkPROGRAMS \
|
||||
mostlyclean-tags mostlyclean-generic
|
||||
|
||||
mostlyclean: mostlyclean-recursive
|
||||
|
||||
clean-am: clean-toolexeclibLTLIBRARIES clean-compile clean-libtool \
|
||||
clean-checkPROGRAMS clean-tags clean-generic \
|
||||
mostlyclean-am
|
||||
clean-am: clean-noinstLTLIBRARIES clean-toolexeclibLTLIBRARIES \
|
||||
clean-compile clean-libtool clean-checkPROGRAMS \
|
||||
clean-tags clean-generic mostlyclean-am
|
||||
|
||||
clean: clean-recursive
|
||||
|
||||
distclean-am: distclean-toolexeclibLTLIBRARIES distclean-compile \
|
||||
distclean-am: distclean-noinstLTLIBRARIES \
|
||||
distclean-toolexeclibLTLIBRARIES distclean-compile \
|
||||
distclean-libtool distclean-checkPROGRAMS \
|
||||
distclean-tags distclean-generic clean-am
|
||||
-rm -f libtool
|
||||
|
|
@ -516,7 +593,8 @@ distclean-am: distclean-toolexeclibLTLIBRARIES distclean-compile \
|
|||
distclean: distclean-recursive
|
||||
-rm -f config.status
|
||||
|
||||
maintainer-clean-am: maintainer-clean-toolexeclibLTLIBRARIES \
|
||||
maintainer-clean-am: maintainer-clean-noinstLTLIBRARIES \
|
||||
maintainer-clean-toolexeclibLTLIBRARIES \
|
||||
maintainer-clean-compile maintainer-clean-libtool \
|
||||
maintainer-clean-checkPROGRAMS maintainer-clean-tags \
|
||||
maintainer-clean-generic distclean-am
|
||||
|
|
@ -526,9 +604,10 @@ maintainer-clean-am: maintainer-clean-toolexeclibLTLIBRARIES \
|
|||
maintainer-clean: maintainer-clean-recursive
|
||||
-rm -f config.status
|
||||
|
||||
.PHONY: mostlyclean-toolexeclibLTLIBRARIES \
|
||||
distclean-toolexeclibLTLIBRARIES clean-toolexeclibLTLIBRARIES \
|
||||
maintainer-clean-toolexeclibLTLIBRARIES \
|
||||
.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
|
||||
clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
|
||||
mostlyclean-toolexeclibLTLIBRARIES distclean-toolexeclibLTLIBRARIES \
|
||||
clean-toolexeclibLTLIBRARIES maintainer-clean-toolexeclibLTLIBRARIES \
|
||||
uninstall-toolexeclibLTLIBRARIES install-toolexeclibLTLIBRARIES \
|
||||
mostlyclean-compile distclean-compile clean-compile \
|
||||
maintainer-clean-compile mostlyclean-libtool distclean-libtool \
|
||||
|
|
|
|||
|
|
@ -1,3 +1,8 @@
|
|||
2002-03-17 Bryce McKinlay <bryce@waitaki.otago.ac.nz>
|
||||
|
||||
* Makefile.am: libfficonvenience -> libffi_convenience.
|
||||
* Makefile.in: Rebuilt.
|
||||
|
||||
2002-03-07 Andreas Tobler <toa@pop.agri.ch>
|
||||
David Edelsohn <edelsohn@gnu.org>
|
||||
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR)
|
|||
endif
|
||||
|
||||
toolexeclib_LTLIBRARIES = libffi.la
|
||||
noinst_LTLIBRARIES = libfficonvenience.la
|
||||
noinst_LTLIBRARIES = libffi_convenience.la
|
||||
|
||||
noinst_PROGRAMS = ffitest
|
||||
|
||||
|
|
@ -110,51 +110,51 @@ libffi_la_common_SOURCES = src/debug.c src/prep_cif.c src/types.c \
|
|||
src/raw_api.c src/java_raw_api.c
|
||||
if MIPS_GCC
|
||||
libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_GCC)
|
||||
libfficonvenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_GCC)
|
||||
libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_GCC)
|
||||
endif
|
||||
if MIPS_SGI
|
||||
libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_SGI)
|
||||
libfficonvenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_SGI)
|
||||
libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_SGI)
|
||||
endif
|
||||
if X86
|
||||
libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_X86)
|
||||
libfficonvenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_X86)
|
||||
libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_X86)
|
||||
endif
|
||||
if X86_WIN32
|
||||
libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_X86_WIN32)
|
||||
libfficonvenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_X86_WIN32)
|
||||
libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_X86_WIN32)
|
||||
endif
|
||||
if SPARC
|
||||
libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_SPARC)
|
||||
libfficonvenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_SPARC)
|
||||
libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_SPARC)
|
||||
endif
|
||||
if ALPHA
|
||||
libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_ALPHA)
|
||||
libfficonvenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_ALPHA)
|
||||
libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_ALPHA)
|
||||
endif
|
||||
if IA64
|
||||
libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_IA64)
|
||||
libfficonvenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_IA64)
|
||||
libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_IA64)
|
||||
endif
|
||||
if M68K
|
||||
libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_M68K)
|
||||
libfficonvenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_M68K)
|
||||
libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_M68K)
|
||||
endif
|
||||
if POWERPC
|
||||
libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_POWERPC)
|
||||
libfficonvenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_POWERPC)
|
||||
libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_POWERPC)
|
||||
endif
|
||||
if POWERPC_AIX
|
||||
libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_POWERPC_AIX)
|
||||
libfficonvenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_POWERPC_AIX)
|
||||
libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_POWERPC_AIX)
|
||||
endif
|
||||
if POWERPC_DARWIN
|
||||
libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_POWERPC_DARWIN)
|
||||
libfficonvenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_POWERPC_DARWIN)
|
||||
libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_POWERPC_DARWIN)
|
||||
endif
|
||||
if ARM
|
||||
libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_ARM)
|
||||
libfficonvenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_ARM)
|
||||
libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_ARM)
|
||||
endif
|
||||
|
||||
AM_CFLAGS = -fexceptions
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Makefile.in generated automatically by automake 1.4 from Makefile.am
|
||||
# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
|
||||
|
||||
# Copyright (C) 1994, 1995-8, 1999, 2001, 2002 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
|
|
@ -95,7 +95,7 @@ EXTRA_DIST = LICENSE ChangeLog.v1 src/mips/ffi.c src/mips/n32.S \
|
|||
src/powerpc/ppc_closure.S src/powerpc/asm.h \
|
||||
src/powerpc/ffi_darwin.c \
|
||||
src/powerpc/darwin.S src/powerpc/aix.S \
|
||||
src/powerpc/darwin_closure.S src/powerpc/aix_closure.S \
|
||||
src/powerpc/darwin_closure.S src/powerpc/aix_closures.S \
|
||||
src/arm/ffi.c src/arm/sysv.S
|
||||
|
||||
|
||||
|
|
@ -154,7 +154,7 @@ MULTICLEAN = true
|
|||
@USE_LIBDIR_FALSE@toolexecdir = @USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias)
|
||||
|
||||
toolexeclib_LTLIBRARIES = libffi.la
|
||||
noinst_LTLIBRARIES = libfficonvenience.la
|
||||
noinst_LTLIBRARIES = libffi_convenience.la
|
||||
|
||||
noinst_PROGRAMS = ffitest
|
||||
|
||||
|
|
@ -171,7 +171,7 @@ TARGET_SRC_ALPHA = src/alpha/ffi.c src/alpha/osf.S
|
|||
TARGET_SRC_IA64 = src/ia64/ffi.c src/ia64/unix.S
|
||||
TARGET_SRC_M68K = src/m68k/ffi.c src/m68k/sysv.S
|
||||
TARGET_SRC_POWERPC = src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S
|
||||
TARGET_SRC_POWERPC_AIX = src/powerpc/ffi_darwin.c src/powerpc/aix.S src/powerpc/aix_closure.S
|
||||
TARGET_SRC_POWERPC_AIX = src/powerpc/ffi_darwin.c src/powerpc/aix.S src/powerpc/aix_closures.S
|
||||
TARGET_SRC_POWERPC_DARWIN = src/powerpc/ffi_darwin.c src/powerpc/darwin.S src/powerpc/darwin_closure.S
|
||||
TARGET_SRC_ARM = src/arm/sysv.S src/arm/ffi.c
|
||||
|
||||
|
|
@ -190,18 +190,18 @@ libffi_la_common_SOURCES = src/debug.c src/prep_cif.c src/types.c \
|
|||
@POWERPC_AIX_TRUE@libffi_la_SOURCES = @POWERPC_AIX_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_POWERPC_AIX)
|
||||
@POWERPC_DARWIN_TRUE@libffi_la_SOURCES = @POWERPC_DARWIN_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_POWERPC_DARWIN)
|
||||
@ARM_TRUE@libffi_la_SOURCES = @ARM_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_ARM)
|
||||
@MIPS_GCC_TRUE@libfficonvenience_la_SOURCES = @MIPS_GCC_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_GCC)
|
||||
@MIPS_SGI_TRUE@libfficonvenience_la_SOURCES = @MIPS_SGI_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_SGI)
|
||||
@X86_TRUE@libfficonvenience_la_SOURCES = @X86_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_X86)
|
||||
@X86_WIN32_TRUE@libfficonvenience_la_SOURCES = @X86_WIN32_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_X86_WIN32)
|
||||
@SPARC_TRUE@libfficonvenience_la_SOURCES = @SPARC_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_SPARC)
|
||||
@ALPHA_TRUE@libfficonvenience_la_SOURCES = @ALPHA_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_ALPHA)
|
||||
@IA64_TRUE@libfficonvenience_la_SOURCES = @IA64_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_IA64)
|
||||
@M68K_TRUE@libfficonvenience_la_SOURCES = @M68K_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_M68K)
|
||||
@POWERPC_TRUE@libfficonvenience_la_SOURCES = @POWERPC_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_POWERPC)
|
||||
@POWERPC_AIX_TRUE@libfficonvenience_la_SOURCES = @POWERPC_AIX_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_POWERPC_AIX)
|
||||
@POWERPC_DARWIN_TRUE@libfficonvenience_la_SOURCES = @POWERPC_DARWIN_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_POWERPC_DARWIN)
|
||||
@ARM_TRUE@libfficonvenience_la_SOURCES = @ARM_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_ARM)
|
||||
@MIPS_GCC_TRUE@libffi_convenience_la_SOURCES = @MIPS_GCC_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_GCC)
|
||||
@MIPS_SGI_TRUE@libffi_convenience_la_SOURCES = @MIPS_SGI_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_SGI)
|
||||
@X86_TRUE@libffi_convenience_la_SOURCES = @X86_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_X86)
|
||||
@X86_WIN32_TRUE@libffi_convenience_la_SOURCES = @X86_WIN32_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_X86_WIN32)
|
||||
@SPARC_TRUE@libffi_convenience_la_SOURCES = @SPARC_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_SPARC)
|
||||
@ALPHA_TRUE@libffi_convenience_la_SOURCES = @ALPHA_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_ALPHA)
|
||||
@IA64_TRUE@libffi_convenience_la_SOURCES = @IA64_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_IA64)
|
||||
@M68K_TRUE@libffi_convenience_la_SOURCES = @M68K_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_M68K)
|
||||
@POWERPC_TRUE@libffi_convenience_la_SOURCES = @POWERPC_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_POWERPC)
|
||||
@POWERPC_AIX_TRUE@libffi_convenience_la_SOURCES = @POWERPC_AIX_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_POWERPC_AIX)
|
||||
@POWERPC_DARWIN_TRUE@libffi_convenience_la_SOURCES = @POWERPC_DARWIN_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_POWERPC_DARWIN)
|
||||
@ARM_TRUE@libffi_convenience_la_SOURCES = @ARM_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_ARM)
|
||||
|
||||
AM_CFLAGS = -fexceptions
|
||||
|
||||
|
|
@ -219,82 +219,65 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I.
|
|||
CPPFLAGS = @CPPFLAGS@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LIBS = @LIBS@
|
||||
libfficonvenience_la_LDFLAGS =
|
||||
libfficonvenience_la_LIBADD =
|
||||
@X86_WIN32_TRUE@libfficonvenience_la_OBJECTS = src/debug.lo \
|
||||
@X86_WIN32_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \
|
||||
@X86_WIN32_TRUE@src/java_raw_api.lo src/x86/ffi.lo src/x86/win32.lo
|
||||
@X86_TRUE@libfficonvenience_la_OBJECTS = src/debug.lo src/prep_cif.lo \
|
||||
@X86_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
|
||||
@X86_TRUE@src/x86/ffi.lo src/x86/sysv.lo
|
||||
@MIPS_GCC_TRUE@libfficonvenience_la_OBJECTS = src/debug.lo \
|
||||
libffi_convenience_la_LDFLAGS =
|
||||
libffi_convenience_la_LIBADD =
|
||||
@MIPS_GCC_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo \
|
||||
@MIPS_GCC_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \
|
||||
@MIPS_GCC_TRUE@src/java_raw_api.lo src/mips/ffi.lo src/mips/o32.lo \
|
||||
@MIPS_GCC_TRUE@src/mips/n32.lo
|
||||
@ARM_TRUE@libfficonvenience_la_OBJECTS = src/debug.lo src/prep_cif.lo \
|
||||
@ARM_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
|
||||
@ARM_TRUE@src/arm/sysv.lo src/arm/ffi.lo
|
||||
@POWERPC_TRUE@libfficonvenience_la_OBJECTS = src/debug.lo \
|
||||
@POWERPC_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \
|
||||
@POWERPC_TRUE@src/java_raw_api.lo src/powerpc/ffi.lo \
|
||||
@POWERPC_TRUE@src/powerpc/sysv.lo src/powerpc/ppc_closure.lo
|
||||
@SPARC_TRUE@libfficonvenience_la_OBJECTS = src/debug.lo src/prep_cif.lo \
|
||||
@SPARC_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
|
||||
@SPARC_TRUE@src/sparc/ffi.lo src/sparc/v8.lo src/sparc/v9.lo
|
||||
@M68K_TRUE@libfficonvenience_la_OBJECTS = src/debug.lo src/prep_cif.lo \
|
||||
@M68K_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
|
||||
@M68K_TRUE@src/m68k/ffi.lo src/m68k/sysv.lo
|
||||
@ALPHA_TRUE@libfficonvenience_la_OBJECTS = src/debug.lo src/prep_cif.lo \
|
||||
@ALPHA_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
|
||||
@ALPHA_TRUE@src/alpha/ffi.lo src/alpha/osf.lo
|
||||
@IA64_TRUE@libfficonvenience_la_OBJECTS = src/debug.lo src/prep_cif.lo \
|
||||
@IA64_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
|
||||
@IA64_TRUE@src/ia64/ffi.lo src/ia64/unix.lo
|
||||
@POWERPC_AIX_TRUE@libfficonvenience_la_OBJECTS = src/debug.lo \
|
||||
@POWERPC_AIX_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo \
|
||||
@POWERPC_AIX_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \
|
||||
@POWERPC_AIX_TRUE@src/java_raw_api.lo src/powerpc/ffi_darwin.lo \
|
||||
@POWERPC_AIX_TRUE@src/powerpc/aix.lo src/powerpc/aix_closure.lo
|
||||
@POWERPC_DARWIN_TRUE@libfficonvenience_la_OBJECTS = src/debug.lo \
|
||||
@POWERPC_AIX_TRUE@src/powerpc/aix.lo src/powerpc/aix_closures.lo
|
||||
@ALPHA_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo \
|
||||
@ALPHA_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \
|
||||
@ALPHA_TRUE@src/java_raw_api.lo src/alpha/ffi.lo src/alpha/osf.lo
|
||||
@IA64_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo src/prep_cif.lo \
|
||||
@IA64_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
|
||||
@IA64_TRUE@src/ia64/ffi.lo src/ia64/unix.lo
|
||||
@POWERPC_DARWIN_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo \
|
||||
@POWERPC_DARWIN_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \
|
||||
@POWERPC_DARWIN_TRUE@src/java_raw_api.lo src/powerpc/ffi_darwin.lo \
|
||||
@POWERPC_DARWIN_TRUE@src/powerpc/darwin.lo src/powerpc/darwin_closure.lo
|
||||
@MIPS_SGI_TRUE@libfficonvenience_la_OBJECTS = src/debug.lo \
|
||||
@POWERPC_DARWIN_TRUE@src/powerpc/darwin.lo \
|
||||
@POWERPC_DARWIN_TRUE@src/powerpc/darwin_closure.lo
|
||||
@MIPS_SGI_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo \
|
||||
@MIPS_SGI_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \
|
||||
@MIPS_SGI_TRUE@src/java_raw_api.lo src/mips/ffi.lo src/mips/o32.lo \
|
||||
@MIPS_SGI_TRUE@src/mips/n32.lo
|
||||
@X86_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo src/prep_cif.lo \
|
||||
@X86_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
|
||||
@X86_TRUE@src/x86/ffi.lo src/x86/sysv.lo
|
||||
@X86_WIN32_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo \
|
||||
@X86_WIN32_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \
|
||||
@X86_WIN32_TRUE@src/java_raw_api.lo src/x86/ffi.lo src/x86/win32.lo
|
||||
@ARM_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo src/prep_cif.lo \
|
||||
@ARM_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
|
||||
@ARM_TRUE@src/arm/sysv.lo src/arm/ffi.lo
|
||||
@SPARC_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo \
|
||||
@SPARC_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \
|
||||
@SPARC_TRUE@src/java_raw_api.lo src/sparc/ffi.lo src/sparc/v8.lo \
|
||||
@SPARC_TRUE@src/sparc/v9.lo
|
||||
@POWERPC_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo \
|
||||
@POWERPC_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \
|
||||
@POWERPC_TRUE@src/java_raw_api.lo src/powerpc/ffi.lo \
|
||||
@POWERPC_TRUE@src/powerpc/sysv.lo src/powerpc/ppc_closure.lo
|
||||
@M68K_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo src/prep_cif.lo \
|
||||
@M68K_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
|
||||
@M68K_TRUE@src/m68k/ffi.lo src/m68k/sysv.lo
|
||||
libffi_la_LIBADD =
|
||||
@X86_WIN32_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \
|
||||
@X86_WIN32_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
|
||||
@X86_WIN32_TRUE@src/x86/ffi.lo src/x86/win32.lo
|
||||
@X86_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo src/types.lo \
|
||||
@X86_TRUE@src/raw_api.lo src/java_raw_api.lo src/x86/ffi.lo \
|
||||
@X86_TRUE@src/x86/sysv.lo
|
||||
@MIPS_GCC_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \
|
||||
@MIPS_GCC_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
|
||||
@MIPS_GCC_TRUE@src/mips/ffi.lo src/mips/o32.lo src/mips/n32.lo
|
||||
@ARM_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo src/types.lo \
|
||||
@ARM_TRUE@src/raw_api.lo src/java_raw_api.lo src/arm/sysv.lo \
|
||||
@ARM_TRUE@src/arm/ffi.lo
|
||||
@POWERPC_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \
|
||||
@POWERPC_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
|
||||
@POWERPC_TRUE@src/powerpc/ffi.lo src/powerpc/sysv.lo \
|
||||
@POWERPC_TRUE@src/powerpc/ppc_closure.lo
|
||||
@SPARC_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \
|
||||
@SPARC_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
|
||||
@SPARC_TRUE@src/sparc/ffi.lo src/sparc/v8.lo src/sparc/v9.lo
|
||||
@M68K_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \
|
||||
@M68K_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
|
||||
@M68K_TRUE@src/m68k/ffi.lo src/m68k/sysv.lo
|
||||
@POWERPC_AIX_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \
|
||||
@POWERPC_AIX_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
|
||||
@POWERPC_AIX_TRUE@src/powerpc/ffi_darwin.lo src/powerpc/aix.lo \
|
||||
@POWERPC_AIX_TRUE@src/powerpc/aix_closures.lo
|
||||
@ALPHA_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \
|
||||
@ALPHA_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
|
||||
@ALPHA_TRUE@src/alpha/ffi.lo src/alpha/osf.lo
|
||||
@IA64_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \
|
||||
@IA64_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
|
||||
@IA64_TRUE@src/ia64/ffi.lo src/ia64/unix.lo
|
||||
@POWERPC_AIX_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \
|
||||
@POWERPC_AIX_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
|
||||
@POWERPC_AIX_TRUE@src/powerpc/ffi_darwin.lo src/powerpc/aix.lo \
|
||||
@POWERPC_AIX_TRUE@src/powerpc/aix_closure.lo
|
||||
@POWERPC_DARWIN_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \
|
||||
@POWERPC_DARWIN_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
|
||||
@POWERPC_DARWIN_TRUE@src/powerpc/ffi_darwin.lo src/powerpc/darwin.lo \
|
||||
|
|
@ -302,6 +285,25 @@ libffi_la_LIBADD =
|
|||
@MIPS_SGI_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \
|
||||
@MIPS_SGI_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
|
||||
@MIPS_SGI_TRUE@src/mips/ffi.lo src/mips/o32.lo src/mips/n32.lo
|
||||
@X86_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo src/types.lo \
|
||||
@X86_TRUE@src/raw_api.lo src/java_raw_api.lo src/x86/ffi.lo \
|
||||
@X86_TRUE@src/x86/sysv.lo
|
||||
@X86_WIN32_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \
|
||||
@X86_WIN32_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
|
||||
@X86_WIN32_TRUE@src/x86/ffi.lo src/x86/win32.lo
|
||||
@ARM_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo src/types.lo \
|
||||
@ARM_TRUE@src/raw_api.lo src/java_raw_api.lo src/arm/sysv.lo \
|
||||
@ARM_TRUE@src/arm/ffi.lo
|
||||
@SPARC_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \
|
||||
@SPARC_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
|
||||
@SPARC_TRUE@src/sparc/ffi.lo src/sparc/v8.lo src/sparc/v9.lo
|
||||
@POWERPC_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \
|
||||
@POWERPC_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
|
||||
@POWERPC_TRUE@src/powerpc/ffi.lo src/powerpc/sysv.lo \
|
||||
@POWERPC_TRUE@src/powerpc/ppc_closure.lo
|
||||
@M68K_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \
|
||||
@M68K_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
|
||||
@M68K_TRUE@src/m68k/ffi.lo src/m68k/sysv.lo
|
||||
noinst_PROGRAMS = ffitest$(EXEEXT)
|
||||
PROGRAMS = $(noinst_PROGRAMS)
|
||||
|
||||
|
|
@ -319,10 +321,10 @@ fficonfig.h.in
|
|||
|
||||
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
||||
TAR = gnutar
|
||||
TAR = gtar
|
||||
GZIP_ENV = --best
|
||||
SOURCES = $(libfficonvenience_la_SOURCES) $(libffi_la_SOURCES) $(ffitest_SOURCES)
|
||||
OBJECTS = $(libfficonvenience_la_OBJECTS) $(libffi_la_OBJECTS) $(ffitest_OBJECTS)
|
||||
SOURCES = $(libffi_convenience_la_SOURCES) $(libffi_la_SOURCES) $(ffitest_SOURCES)
|
||||
OBJECTS = $(libffi_convenience_la_OBJECTS) $(libffi_la_OBJECTS) $(ffitest_OBJECTS)
|
||||
|
||||
all: all-redirect
|
||||
.SUFFIXES:
|
||||
|
|
@ -430,8 +432,8 @@ distclean-libtool:
|
|||
|
||||
maintainer-clean-libtool:
|
||||
|
||||
libfficonvenience.la: $(libfficonvenience_la_OBJECTS) $(libfficonvenience_la_DEPENDENCIES)
|
||||
$(LINK) $(libfficonvenience_la_LDFLAGS) $(libfficonvenience_la_OBJECTS) $(libfficonvenience_la_LIBADD) $(LIBS)
|
||||
libffi_convenience.la: $(libffi_convenience_la_OBJECTS) $(libffi_convenience_la_DEPENDENCIES)
|
||||
$(LINK) $(libffi_convenience_la_LDFLAGS) $(libffi_convenience_la_OBJECTS) $(libffi_convenience_la_LIBADD) $(LIBS)
|
||||
|
||||
libffi.la: $(libffi_la_OBJECTS) $(libffi_la_DEPENDENCIES)
|
||||
$(LINK) -rpath $(toolexeclibdir) $(libffi_la_LDFLAGS) $(libffi_la_OBJECTS) $(libffi_la_LIBADD) $(LIBS)
|
||||
|
|
@ -485,7 +487,7 @@ maintainer-clean-recursive:
|
|||
dot_seen=no; \
|
||||
rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
|
||||
rev="$$subdir $$rev"; \
|
||||
test "$$subdir" = "." && dot_seen=yes; \
|
||||
test "$$subdir" != "." || dot_seen=yes; \
|
||||
done; \
|
||||
test "$$dot_seen" = "no" && rev=". $$rev"; \
|
||||
target=`echo $@ | sed s/-recursive//`; \
|
||||
|
|
|
|||
|
|
@ -1,3 +1,13 @@
|
|||
2002-03-17 Bryce McKinlay <bryce@waitaki.otago.ac.nz>
|
||||
|
||||
Build a single libgcj.so, without separate gc and zlib libraries.
|
||||
* configure.in: Use convenience libraries for boehm-gc and zlib. Set
|
||||
SYS_ZLIBS if system zlib is used.
|
||||
* configure: Rebuilt.
|
||||
* Makefile.am: Use boehm-gc and zlib convenience libraries.
|
||||
* Makefile.in: Rebuilt.
|
||||
* libtool-version: Increment .so version number.
|
||||
|
||||
2002-03-16 Bryce McKinlay <bryce@waitaki.otago.ac.nz>
|
||||
|
||||
* Makefile.am: Use empty -classpath flag in addition to -bootclasspath.
|
||||
|
|
|
|||
|
|
@ -130,15 +130,16 @@ EXTRA_libgcj_la_SOURCES = boehm.cc nogc.cc posix-threads.cc no-threads.cc \
|
|||
win32-threads.cc posix.cc win32.cc \
|
||||
$(c_source_files) $(java_source_files) $(built_java_source_files)
|
||||
libgcj_la_DEPENDENCIES = libgcj.jar $(javao_files) \
|
||||
$(c_files) $(GCOBJS) $(THREADOBJS) $(PLATFORMOBJS) $(LIBLTDL)
|
||||
$(c_files) $(GCOBJS) $(THREADOBJS) $(PLATFORMOBJS) $(LIBLTDL) \
|
||||
$(LIBFFI) $(ZLIBS) $(GCLIBS)
|
||||
|
||||
libgcj_la_LIBADD = $(javao_files) $(c_files) $(GCOBJS) \
|
||||
$(THREADOBJS) $(PLATFORMOBJS)
|
||||
# Include THREADLIBS here to ensure that the correct version of
|
||||
# certain linuxthread functions get linked:
|
||||
libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLIBS) $(LIBLTDL) \
|
||||
$(GCLIBS) $(ZLIBS) \
|
||||
## The mysterious backslash is consumed by make.
|
||||
$(SYS_ZLIBS) \
|
||||
## The mysterious backslash is consumed by make.
|
||||
-version-info `grep -v '^\#' $(srcdir)/libtool-version`
|
||||
libgcj_la_LINK = $(LIBLINK)
|
||||
|
||||
|
|
@ -240,7 +241,7 @@ $(javao_files) $(x_javao_files): %.lo: %.java
|
|||
libgcj.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES)
|
||||
@: $(shell echo Creating list of files to link...) $(shell rm -f libgcj.objectlist || :) $(shell touch libgcj.objectlist) $(foreach object,$(libgcj_la_OBJECTS) $(libgcj_la_LIBADD),$(shell echo $(object) >> libgcj.objectlist))
|
||||
$(libgcj_la_LINK) -objectlist libgcj.objectlist \
|
||||
@LIBFFI@ \
|
||||
@GCLIBS@ @LIBFFI@ @ZLIBS@ \
|
||||
-rpath $(toolexeclibdir) $(libgcj_la_LDFLAGS) $(LIBS)
|
||||
|
||||
libgcjx.la: $(libgcjx_la_OBJECTS) $(libgcjx_la_DEPENDENCIES)
|
||||
|
|
@ -433,7 +434,7 @@ jv_convert_LDADD = libgcj.la -L$(here)/.libs
|
|||
## Depend on the spec file to make sure it is up to date before
|
||||
## linking this program.
|
||||
jv_convert_DEPENDENCIES = $(convert_source_files:.java=.lo) \
|
||||
$(GCDEPS) $(THREADDEPS) $(ZDEPS) libgcj.la libgcj.spec
|
||||
libgcj.la libgcj.spec
|
||||
|
||||
gij_SOURCES = gij.cc
|
||||
## We need -nodefaultlibs because we want to avoid gcj's `-lgcj'. We
|
||||
|
|
@ -449,7 +450,7 @@ gij_LINK = $(GCJLINK)
|
|||
gij_LDADD = libgcj.la -L$(here)/.libs
|
||||
## Depend on the spec file to make sure it is up to date before
|
||||
## linking this program.
|
||||
gij_DEPENDENCIES = $(GCDEPS) $(THREADDEPS) $(ZDEPS) libgcj.la libgcj.spec
|
||||
gij_DEPENDENCIES = libgcj.la libgcj.spec
|
||||
|
||||
rmic_SOURCES =
|
||||
## This is a dummy definition.
|
||||
|
|
@ -465,7 +466,7 @@ rmic_LINK = $(GCJLINK)
|
|||
rmic_LDADD = libgcj.la -L$(here)/.libs
|
||||
## Depend on the spec file to make sure it is up to date before
|
||||
## linking this program.
|
||||
rmic_DEPENDENCIES = $(GCDEPS) $(THREADDEPS) $(ZDEPS) libgcj.la libgcj.spec
|
||||
rmic_DEPENDENCIES = libgcj.la libgcj.spec
|
||||
|
||||
rmiregistry_SOURCES =
|
||||
## This is a dummy definition.
|
||||
|
|
@ -481,7 +482,7 @@ rmiregistry_LINK = $(GCJLINK)
|
|||
rmiregistry_LDADD = libgcj.la -L$(here)/.libs
|
||||
## Depend on the spec file to make sure it is up to date before
|
||||
## linking this program.
|
||||
rmiregistry_DEPENDENCIES = $(GCDEPS) $(THREADDEPS) $(ZDEPS) libgcj.la libgcj.spec
|
||||
rmiregistry_DEPENDENCIES = libgcj.la libgcj.spec
|
||||
|
||||
# The Unicode consortium does not permit re-distributing the file JIS0201.TXT.
|
||||
# You can get it from ftp://ftp.unicode.org/Public/MAPPINGS/EASTASIA/JIS/.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Makefile.in generated automatically by automake 1.4 from Makefile.am
|
||||
# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
|
||||
|
||||
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
|
|
@ -107,13 +107,13 @@ RANLIB = @RANLIB@
|
|||
STRIP = @STRIP@
|
||||
SYSDEP_SOURCES = @SYSDEP_SOURCES@
|
||||
SYSTEMSPEC = @SYSTEMSPEC@
|
||||
SYS_ZLIBS = @SYS_ZLIBS@
|
||||
THREADDEPS = @THREADDEPS@
|
||||
THREADINCS = @THREADINCS@
|
||||
THREADLIBS = @THREADLIBS@
|
||||
THREADOBJS = @THREADOBJS@
|
||||
THREADSPEC = @THREADSPEC@
|
||||
VERSION = @VERSION@
|
||||
ZDEPS = @ZDEPS@
|
||||
ZINCS = @ZINCS@
|
||||
ZLIBS = @ZLIBS@
|
||||
ZLIBSPEC = @ZLIBSPEC@
|
||||
|
|
@ -196,7 +196,8 @@ EXTRA_libgcj_la_SOURCES = boehm.cc nogc.cc posix-threads.cc no-threads.cc \
|
|||
$(c_source_files) $(java_source_files) $(built_java_source_files)
|
||||
|
||||
libgcj_la_DEPENDENCIES = libgcj.jar $(javao_files) \
|
||||
$(c_files) $(GCOBJS) $(THREADOBJS) $(PLATFORMOBJS) $(LIBLTDL)
|
||||
$(c_files) $(GCOBJS) $(THREADOBJS) $(PLATFORMOBJS) $(LIBLTDL) \
|
||||
$(LIBFFI) $(ZLIBS) $(GCLIBS)
|
||||
|
||||
|
||||
libgcj_la_LIBADD = $(javao_files) $(c_files) $(GCOBJS) \
|
||||
|
|
@ -205,7 +206,7 @@ libgcj_la_LIBADD = $(javao_files) $(c_files) $(GCOBJS) \
|
|||
# Include THREADLIBS here to ensure that the correct version of
|
||||
# certain linuxthread functions get linked:
|
||||
libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLIBS) $(LIBLTDL) \
|
||||
$(GCLIBS) $(ZLIBS) \
|
||||
$(SYS_ZLIBS) \
|
||||
-version-info `grep -v '^\#' $(srcdir)/libtool-version`
|
||||
|
||||
libgcj_la_LINK = $(LIBLINK)
|
||||
|
|
@ -253,14 +254,14 @@ jv_convert_LDFLAGS = --main=gnu.gcj.convert.Convert \
|
|||
jv_convert_LINK = $(GCJLINK)
|
||||
jv_convert_LDADD = libgcj.la -L$(here)/.libs
|
||||
jv_convert_DEPENDENCIES = $(convert_source_files:.java=.lo) \
|
||||
$(GCDEPS) $(THREADDEPS) $(ZDEPS) libgcj.la libgcj.spec
|
||||
libgcj.la libgcj.spec
|
||||
|
||||
|
||||
gij_SOURCES = gij.cc
|
||||
gij_LDFLAGS = -rpath $(toolexeclibdir) -shared-libgcc
|
||||
gij_LINK = $(GCJLINK)
|
||||
gij_LDADD = libgcj.la -L$(here)/.libs
|
||||
gij_DEPENDENCIES = $(GCDEPS) $(THREADDEPS) $(ZDEPS) libgcj.la libgcj.spec
|
||||
gij_DEPENDENCIES = libgcj.la libgcj.spec
|
||||
|
||||
rmic_SOURCES =
|
||||
EXTRA_rmic_SOURCES = $(rmi_java_source_files)
|
||||
|
|
@ -269,7 +270,7 @@ rmic_LDFLAGS = --main=gnu.java.rmi.rmic.RMIC \
|
|||
|
||||
rmic_LINK = $(GCJLINK)
|
||||
rmic_LDADD = libgcj.la -L$(here)/.libs
|
||||
rmic_DEPENDENCIES = $(GCDEPS) $(THREADDEPS) $(ZDEPS) libgcj.la libgcj.spec
|
||||
rmic_DEPENDENCIES = libgcj.la libgcj.spec
|
||||
|
||||
rmiregistry_SOURCES =
|
||||
EXTRA_rmiregistry_SOURCES = $(rmi_java_source_files)
|
||||
|
|
@ -278,7 +279,7 @@ rmiregistry_LDFLAGS = --main=gnu.java.rmi.registry.RegistryImpl \
|
|||
|
||||
rmiregistry_LINK = $(GCJLINK)
|
||||
rmiregistry_LDADD = libgcj.la -L$(here)/.libs
|
||||
rmiregistry_DEPENDENCIES = $(GCDEPS) $(THREADDEPS) $(ZDEPS) libgcj.la libgcj.spec
|
||||
rmiregistry_DEPENDENCIES = libgcj.la libgcj.spec
|
||||
|
||||
gen_from_JIS_SOURCES =
|
||||
EXTRA_gen_from_JIS_SOURCES = $(srcdir)/$(CONVERT_DIR)/gen-from-JIS.c \
|
||||
|
|
@ -2925,7 +2926,7 @@ maintainer-clean-recursive:
|
|||
dot_seen=no; \
|
||||
rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
|
||||
rev="$$subdir $$rev"; \
|
||||
test "$$subdir" = "." && dot_seen=yes; \
|
||||
test "$$subdir" != "." || dot_seen=yes; \
|
||||
done; \
|
||||
test "$$dot_seen" = "no" && rev=". $$rev"; \
|
||||
target=`echo $@ | sed s/-recursive//`; \
|
||||
|
|
@ -3256,7 +3257,7 @@ $(javao_files) $(x_javao_files): %.lo: %.java
|
|||
libgcj.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES)
|
||||
@: $(shell echo Creating list of files to link...) $(shell rm -f libgcj.objectlist || :) $(shell touch libgcj.objectlist) $(foreach object,$(libgcj_la_OBJECTS) $(libgcj_la_LIBADD),$(shell echo $(object) >> libgcj.objectlist))
|
||||
$(libgcj_la_LINK) -objectlist libgcj.objectlist \
|
||||
@LIBFFI@ \
|
||||
@GCLIBS@ @LIBFFI@ @ZLIBS@ \
|
||||
-rpath $(toolexeclibdir) $(libgcj_la_LDFLAGS) $(LIBS)
|
||||
|
||||
libgcjx.la: $(libgcjx_la_OBJECTS) $(libgcjx_la_DEPENDENCIES)
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -176,7 +176,7 @@ LIBFFI=
|
|||
LIBFFIINCS=
|
||||
if test "$with_libffi" != no; then
|
||||
AC_DEFINE(USE_LIBFFI)
|
||||
LIBFFI=../libffi/libfficonvenience.la
|
||||
LIBFFI=../libffi/libffi_convenience.la
|
||||
LIBFFIINCS='-I$(top_srcdir)/../libffi/include -I$(MULTIBUILDTOP)../libffi/include'
|
||||
fi
|
||||
AC_SUBST(LIBFFI)
|
||||
|
|
@ -290,14 +290,11 @@ GCTESTSPEC=
|
|||
case "$GC" in
|
||||
boehm)
|
||||
AC_MSG_RESULT(boehm)
|
||||
GCDEPS='$(top_builddir)/../boehm-gc/libgcjgc.la'
|
||||
# We include the path to the boehm-gc build directory.
|
||||
# See Makefile.am to understand why.
|
||||
GCLIBS="$GCDEPS -L\$(here)/../boehm-gc/$libsubdir"
|
||||
GCLIBS=../boehm-gc/libgcjgc_convenience.la
|
||||
GCINCS='-I$(top_srcdir)/../boehm-gc/include'
|
||||
GCSPEC='-lgcjgc'
|
||||
JC1GCSPEC='-fuse-boehm-gc'
|
||||
GCTESTSPEC="-L`pwd`/../boehm-gc/.libs -rpath `pwd`/../boehm-gc/.libs"
|
||||
|
||||
dnl We also want to pick up some cpp flags required when including
|
||||
dnl boehm-config.h. Yuck.
|
||||
GCINCS="$GCINCS `cat ../boehm-gc/boehm-cflags`"
|
||||
|
|
@ -471,9 +468,6 @@ if test -n "${with_cross_host}"; then
|
|||
dnl Assume we do not have getuid and friends.
|
||||
AC_DEFINE(NO_GETUID)
|
||||
|
||||
ZLIBSPEC=-lzgcj
|
||||
ZLIBTESTSPEC="-L`pwd`/../zlib/.libs -rpath `pwd`/../zlib/.libs"
|
||||
|
||||
# If Canadian cross, then don't pick up tools from the build
|
||||
# directory.
|
||||
if test x"$build" != x"$with_cross_host" && x"$build" != x"$target"; then
|
||||
|
|
@ -670,10 +664,7 @@ else
|
|||
SYSTEMSPEC="$SYSTEMSPEC $gcj_cv_lib_sockets"
|
||||
|
||||
if test "$with_system_zlib" = yes; then
|
||||
AC_CHECK_LIB(z, deflate, ZLIBSPEC=-lz, ZLIBSPEC=-lzgcj)
|
||||
else
|
||||
ZLIBSPEC=-lzgcj
|
||||
ZLIBTESTSPEC="-L`pwd`/../zlib/.libs -rpath `pwd`/../zlib/.libs"
|
||||
AC_CHECK_LIB(z, deflate, ZLIBSPEC=-lz, ZLIBSPEC=)
|
||||
fi
|
||||
|
||||
# On Solaris, and maybe other architectures, the Boehm collector
|
||||
|
|
@ -730,19 +721,19 @@ CPPFLAGS=$GCJ_SAVE_CPPFLAGS
|
|||
AC_COMPILE_CHECK_SIZEOF(void *)
|
||||
|
||||
ZLIBS=
|
||||
ZDEPS=
|
||||
SYS_ZLIBS=
|
||||
ZINCS=
|
||||
if test "x$ZLIBSPEC" = "x-lzgcj"; then
|
||||
# We include the path to the zlib build directory.
|
||||
# See Makefile.am to understand why.
|
||||
ZDEPS='$(top_builddir)/../zlib/libzgcj.la'
|
||||
ZLIBS="$ZDEPS -L\$(here)/../zlib/$libsubdir"
|
||||
|
||||
if test -z "$ZLIBSPEC"; then
|
||||
# Use zlib from the GCC tree.
|
||||
ZINCS='-I$(top_srcdir)/../zlib'
|
||||
ZLIBS=../zlib/libzgcj_convenience.la
|
||||
else
|
||||
ZLIBS="$ZLIBSPEC"
|
||||
# System's zlib.
|
||||
SYS_ZLIBS="$ZLIBSPEC"
|
||||
fi
|
||||
AC_SUBST(ZLIBS)
|
||||
AC_SUBST(ZDEPS)
|
||||
AC_SUBST(SYS_ZLIBS)
|
||||
AC_SUBST(ZINCS)
|
||||
AC_SUBST(DIVIDESPEC)
|
||||
AC_SUBST(EXCEPTIONSPEC)
|
||||
|
|
|
|||
|
|
@ -3,4 +3,4 @@
|
|||
# a separate file so that version updates don't involve re-running
|
||||
# automake.
|
||||
# CURRENT:REVISION:AGE
|
||||
2:0:0
|
||||
3:0:0
|
||||
|
|
|
|||
|
|
@ -1,3 +1,8 @@
|
|||
2002-03-17 Bryce McKinlay <bryce@waitaki.otago.ac.nz>
|
||||
|
||||
* Makefile.am: Make target library a convenience library.
|
||||
* Makefile.in: Rebuilt.
|
||||
|
||||
2002-03-11 Tom Tromey <tromey@redhat.com>
|
||||
|
||||
* ChangeLog.gcj: Imported 1.1.4, while preserving local changes.
|
||||
|
|
|
|||
|
|
@ -25,12 +25,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
|
||||
|
||||
if TARGET_LIBRARY
|
||||
## We don't use `libz.la' because we don't want to conflict with a
|
||||
## system library of that name.
|
||||
toolexeclib_LTLIBRARIES = @target_all@
|
||||
EXTRA_LTLIBRARIES = libzgcj.la
|
||||
libzgcj_la_SOURCES = $(ZLIB_SOURCES)
|
||||
libzgcj_la_LDFLAGS = -version-info 0:0:0 -rpath $(toolexeclibdir)
|
||||
noinst_LTLIBRARIES = libzgcj_convenience.la
|
||||
libzgcj_convenience_la_SOURCES = $(ZLIB_SOURCES)
|
||||
else
|
||||
toolexeclib_LIBRARIES = libz.a
|
||||
libz_a_SOURCES = $(ZLIB_SOURCES)
|
||||
|
|
|
|||
118
zlib/Makefile.in
118
zlib/Makefile.in
|
|
@ -1,6 +1,6 @@
|
|||
# Makefile.in generated automatically by automake 1.4 from Makefile.am
|
||||
# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
|
||||
|
||||
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
|
|
@ -96,12 +96,9 @@ 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)
|
||||
@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 \
|
||||
|
|
@ -109,18 +106,10 @@ 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_FALSE@toolexeclib_LIBRARIES = \
|
||||
@TARGET_LIBRARY_FALSE@libz.a
|
||||
@TARGET_LIBRARY_FALSE@libz_a_SOURCES = \
|
||||
@TARGET_LIBRARY_FALSE@$(ZLIB_SOURCES)
|
||||
@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)
|
||||
|
||||
# Work around what appears to be a GNU make bug handling MAKEFLAGS
|
||||
# values defined in terms of make variables, as is the case for CC and
|
||||
|
|
@ -181,13 +170,15 @@ libz_a_LIBADD =
|
|||
@TARGET_LIBRARY_FALSE@inftrees.$(OBJEXT) infutil.$(OBJEXT) \
|
||||
@TARGET_LIBRARY_FALSE@trees.$(OBJEXT) uncompr.$(OBJEXT) zutil.$(OBJEXT)
|
||||
AR = ar
|
||||
LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
|
||||
LTLIBRARIES = $(noinst_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
|
||||
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)
|
||||
|
|
@ -199,10 +190,10 @@ aclocal.m4 configure configure.in
|
|||
|
||||
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
||||
TAR = tar
|
||||
TAR = gtar
|
||||
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:
|
||||
|
|
@ -303,33 +294,17 @@ libz.a: $(libz_a_OBJECTS) $(libz_a_DEPENDENCIES)
|
|||
$(AR) cru libz.a $(libz_a_OBJECTS) $(libz_a_LIBADD)
|
||||
$(RANLIB) libz.a
|
||||
|
||||
mostlyclean-toolexeclibLTLIBRARIES:
|
||||
mostlyclean-noinstLTLIBRARIES:
|
||||
|
||||
clean-toolexeclibLTLIBRARIES:
|
||||
-test -z "$(toolexeclib_LTLIBRARIES)" || rm -f $(toolexeclib_LTLIBRARIES)
|
||||
clean-noinstLTLIBRARIES:
|
||||
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
|
||||
|
||||
distclean-toolexeclibLTLIBRARIES:
|
||||
distclean-noinstLTLIBRARIES:
|
||||
|
||||
maintainer-clean-toolexeclibLTLIBRARIES:
|
||||
maintainer-clean-noinstLTLIBRARIES:
|
||||
|
||||
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
|
||||
|
||||
uninstall-toolexeclibLTLIBRARIES:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \
|
||||
$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(toolexeclibdir)/$$p; \
|
||||
done
|
||||
|
||||
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
|
||||
|
||||
|
|
@ -401,7 +376,7 @@ distdir: $(DISTFILES)
|
|||
@for file in $(DISTFILES); do \
|
||||
if test -f $$file; then d=.; else d=$(srcdir); fi; \
|
||||
if test -d $$d/$$file; then \
|
||||
cp -pr $$/$$file $(distdir)/$$file; \
|
||||
cp -pr $$d/$$file $(distdir)/$$file; \
|
||||
else \
|
||||
test -f $(distdir)/$$file \
|
||||
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
|
||||
|
|
@ -418,8 +393,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:
|
||||
|
|
@ -428,16 +402,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:
|
||||
|
|
@ -450,19 +422,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
|
||||
|
||||
|
|
@ -471,7 +443,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;"
|
||||
|
|
@ -485,17 +457,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.
|
||||
|
|
|
|||
Loading…
Reference in New Issue