aboutsummaryrefslogtreecommitdiff
path: root/libffi/include
diff options
context:
space:
mode:
authorAndreas Tobler <a.tobler@schweiz.ch>2003-11-12 19:18:30 +0100
committerAndreas Tobler <andreast@gcc.gnu.org>2003-11-12 19:18:30 +0100
commitea81d2a3e1896a810829bc423cdb40eb9fb0a113 (patch)
tree90cac5078948cc14791492f6d3c325dab0a9b523 /libffi/include
parentb1a19c7ceab2890e5f54896ed643c0ff86f74d2f (diff)
downloadgcc-ea81d2a3e1896a810829bc423cdb40eb9fb0a113.zip
gcc-ea81d2a3e1896a810829bc423cdb40eb9fb0a113.tar.gz
gcc-ea81d2a3e1896a810829bc423cdb40eb9fb0a113.tar.bz2
re PR libffi/11147 (fficonfig.h is abi-specific)
2003-11-12 Andreas Tobler <a.tobler@schweiz.ch> * configure.in, include/Makefile.am: PR libgcj/11147, install the ffitarget.h header file in a gcc versioned and target dependent place. * configure: Regenerated. * Makefile.in, include/Makefile.in: Likewise. * testsuite/Makefile.in: Likewise. From-SVN: r73504
Diffstat (limited to 'libffi/include')
-rw-r--r--libffi/include/Makefile.am5
-rw-r--r--libffi/include/Makefile.in83
2 files changed, 71 insertions, 17 deletions
diff --git a/libffi/include/Makefile.am b/libffi/include/Makefile.am
index f9231a6..048824d 100644
--- a/libffi/include/Makefile.am
+++ b/libffi/include/Makefile.am
@@ -7,4 +7,7 @@ EXTRA_DIST=ffi.h.in ffi_common.h
hackdir=$(includedir)
-hack_DATA=ffitarget.h ffi.h
+hack_DATA= ffi.h
+
+toollibffidir = @tool_include_dir@/libffi
+toollibffi_HEADERS = ffitarget.h
diff --git a/libffi/include/Makefile.in b/libffi/include/Makefile.in
index 0eb1919..b562bba 100644
--- a/libffi/include/Makefile.in
+++ b/libffi/include/Makefile.in
@@ -86,7 +86,9 @@ STRIP = @STRIP@
TARGET = @TARGET@
TARGETDIR = @TARGETDIR@
VERSION = @VERSION@
+gcc_version = @gcc_version@
libffi_basedir = @libffi_basedir@
+tool_include_dir = @tool_include_dir@
toolexecdir = @toolexecdir@
toolexeclibdir = @toolexeclibdir@
@@ -97,12 +99,17 @@ EXTRA_DIST = ffi.h.in ffi_common.h
hackdir = $(includedir)
-hack_DATA = ffitarget.h ffi.h
+hack_DATA = ffi.h
+
+toollibffidir = @tool_include_dir@/libffi
+toollibffi_HEADERS = ffitarget.h
mkinstalldirs = $(SHELL) $(top_srcdir)/${libffi_basedir}../mkinstalldirs
CONFIG_HEADER = ../fficonfig.h
CONFIG_CLEAN_FILES = ffi.h
DATA = $(hack_DATA)
+HEADERS = $(toollibffi_HEADERS)
+
DIST_COMMON = Makefile.am Makefile.in ffi.h.in
@@ -140,9 +147,50 @@ uninstall-hackDATA:
list='$(hack_DATA)'; for p in $$list; do \
rm -f $(DESTDIR)$(hackdir)/$$p; \
done
+
+install-toollibffiHEADERS: $(toollibffi_HEADERS)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(toollibffidir)
+ @list='$(toollibffi_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
+ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(toollibffidir)/$$p"; \
+ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(toollibffidir)/$$p; \
+ done
+
+uninstall-toollibffiHEADERS:
+ @$(NORMAL_UNINSTALL)
+ list='$(toollibffi_HEADERS)'; for p in $$list; do \
+ rm -f $(DESTDIR)$(toollibffidir)/$$p; \
+ done
+
tags: TAGS
-TAGS:
+ID: $(HEADERS) $(SOURCES) $(LISP)
+ list='$(SOURCES) $(HEADERS)'; \
+ unique=`for i in $$list; do echo $$i; done | \
+ awk ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ here=`pwd` && cd $(srcdir) \
+ && mkid -f$$here/ID $$unique $(LISP)
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS)'; \
+ unique=`for i in $$list; do echo $$i; done | \
+ awk ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+ || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
+
+mostlyclean-tags:
+
+clean-tags:
+
+distclean-tags:
+ -rm -f TAGS ID
+
+maintainer-clean-tags:
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
@@ -175,20 +223,20 @@ installcheck: installcheck-am
install-exec-am:
install-exec: install-exec-am
-install-data-am: install-hackDATA
+install-data-am: install-hackDATA install-toollibffiHEADERS
install-data: install-data-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install: install-am
-uninstall-am: uninstall-hackDATA
+uninstall-am: uninstall-hackDATA uninstall-toollibffiHEADERS
uninstall: uninstall-am
-all-am: Makefile $(DATA)
+all-am: Makefile $(DATA) $(HEADERS)
all-redirect: all-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(hackdir)
+ $(mkinstalldirs) $(DESTDIR)$(hackdir) $(DESTDIR)$(toollibffidir)
mostlyclean-generic:
@@ -201,31 +249,34 @@ distclean-generic:
-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
-mostlyclean-am: mostlyclean-generic
+mostlyclean-am: mostlyclean-tags mostlyclean-generic
mostlyclean: mostlyclean-am
-clean-am: clean-generic mostlyclean-am
+clean-am: clean-tags clean-generic mostlyclean-am
clean: clean-am
-distclean-am: distclean-generic clean-am
+distclean-am: distclean-tags distclean-generic clean-am
-rm -f libtool
distclean: distclean-am
-maintainer-clean-am: maintainer-clean-generic distclean-am
+maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \
+ distclean-am
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
maintainer-clean: maintainer-clean-am
-.PHONY: uninstall-hackDATA install-hackDATA tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck 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
+.PHONY: uninstall-hackDATA install-hackDATA uninstall-toollibffiHEADERS \
+install-toollibffiHEADERS tags mostlyclean-tags distclean-tags \
+clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
+check-am installcheck-am installcheck 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
# Tell versions [3.59,3.63) of GNU make to not export all variables.