ag/cpython-source-deps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix make dist again

Browse Source
This commit is contained in:
green
2008-02-14 15:37:00 +00:00
parent d4970cf452
commit 77fe243556
5 changed files with 19 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libffi/ChangeLog.libffi
View File

@@ -1,7 +1,7 @@
2008-02-14 Anthony Green <green@redhat.com> 2008-02-14 Anthony Green <green@redhat.com>
* include/Makefile.am (nodist_includes_HEADERS): Define. Don't * include/Makefile.am (nodist_includes_HEADERS): Define. Don't
distribute ffitarget.h from the build include dir. distribute ffitarget.h or ffi.h from the build include dir.
* Makefile.in: Rebuilt. * Makefile.in: Rebuilt.
2008-02-14 Anthony Green <green@redhat.com> 2008-02-14 Anthony Green <green@redhat.com>

2
libffi/Makefile.am
View File

@@ -157,7 +157,7 @@ endif
libffi_convenience_la_SOURCES = $(libffi_la_SOURCES) libffi_convenience_la_SOURCES = $(libffi_la_SOURCES)
nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES) nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES)
AM_CFLAGS = -Wall -g -fexceptions AM_CFLAGS = -Wall -g -fexceptions -D$(TARGET)
libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version`

2
libffi/Makefile.in
View File

@@ -402,7 +402,7 @@ nodist_libffi_la_SOURCES = $(am__append_1) $(am__append_2) \
$(am__append_21) $(am__append_22) $(am__append_21) $(am__append_22)
libffi_convenience_la_SOURCES = $(libffi_la_SOURCES) libffi_convenience_la_SOURCES = $(libffi_la_SOURCES)
nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES) nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES)
AM_CFLAGS = -Wall -g -fexceptions AM_CFLAGS = -Wall -g -fexceptions -D$(TARGET)
libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version`
AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
AM_CCASFLAGS = $(AM_CPPFLAGS) AM_CCASFLAGS = $(AM_CPPFLAGS)

3
libffi/include/Makefile.am
View File

@@ -6,5 +6,4 @@ DISTCLEANFILES=ffitarget.h
EXTRA_DIST=ffi.h.in ffi_common.h EXTRA_DIST=ffi.h.in ffi_common.h
includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
includes_HEADERS = ffi.h nodist_includes_HEADERS = ffi.h ffitarget.h
nodist_includes_HEADERS = ffitarget.h

54
libffi/include/Makefile.in
View File

@@ -34,8 +34,8 @@ build_triplet = @build@
host_triplet = @host@ host_triplet = @host@
target_triplet = @target@ target_triplet = @target@
subdir = include subdir = include
DIST_COMMON = $(includes_HEADERS) $(srcdir)/Makefile.am \ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/Makefile.in $(srcdir)/ffi.h.in $(srcdir)/ffi.h.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/configure.ac $(top_srcdir)/configure.ac
@@ -52,11 +52,9 @@ am__vpath_adj = case $$p in \
*) f=$$p;; \ *) f=$$p;; \
esac; esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(includesdir)" \ am__installdirs = "$(DESTDIR)$(includesdir)"
"$(DESTDIR)$(includesdir)"
includesHEADERS_INSTALL = $(INSTALL_HEADER)
nodist_includesHEADERS_INSTALL = $(INSTALL_HEADER) nodist_includesHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(includes_HEADERS) $(nodist_includes_HEADERS) HEADERS = $(nodist_includes_HEADERS)
ETAGS = etags ETAGS = etags
CTAGS = ctags CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -185,8 +183,7 @@ AUTOMAKE_OPTIONS = foreign
DISTCLEANFILES = ffitarget.h DISTCLEANFILES = ffitarget.h
EXTRA_DIST = ffi.h.in ffi_common.h EXTRA_DIST = ffi.h.in ffi_common.h
includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
includes_HEADERS = ffi.h nodist_includes_HEADERS = ffi.h ffitarget.h
nodist_includes_HEADERS = ffitarget.h
all: all-am all: all-am
.SUFFIXES: .SUFFIXES:
@@ -227,23 +224,6 @@ mostlyclean-libtool:
clean-libtool: clean-libtool:
-rm -rf .libs _libs -rm -rf .libs _libs
install-includesHEADERS: $(includes_HEADERS)
@$(NORMAL_INSTALL)
test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)"
@list='$(includes_HEADERS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
echo " $(includesHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includesdir)/$$f'"; \
$(includesHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includesdir)/$$f"; \
done
uninstall-includesHEADERS:
@$(NORMAL_UNINSTALL)
@list='$(includes_HEADERS)'; for p in $$list; do \
f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(includesdir)/$$f'"; \
rm -f "$(DESTDIR)$(includesdir)/$$f"; \
done
install-nodist_includesHEADERS: $(nodist_includes_HEADERS) install-nodist_includesHEADERS: $(nodist_includes_HEADERS)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)" test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)"
@@ -340,7 +320,7 @@ check-am: all-am
check: check-am check: check-am
all-am: Makefile $(HEADERS) all-am: Makefile $(HEADERS)
installdirs: installdirs:
for dir in "$(DESTDIR)$(includesdir)" "$(DESTDIR)$(includesdir)"; do \ for dir in "$(DESTDIR)$(includesdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done done
install: install-am install: install-am
@@ -386,8 +366,7 @@ info: info-am
info-am: info-am:
install-data-am: install-includesHEADERS \ install-data-am: install-nodist_includesHEADERS
install-nodist_includesHEADERS
install-dvi: install-dvi-am install-dvi: install-dvi-am
@@ -421,8 +400,7 @@ ps: ps-am
ps-am: ps-am:
uninstall-am: uninstall-includesHEADERS \ uninstall-am: uninstall-nodist_includesHEADERS
uninstall-nodist_includesHEADERS
.MAKE: install-am install-strip .MAKE: install-am install-strip
@@ -431,15 +409,13 @@ uninstall-am: uninstall-includesHEADERS \
distclean-libtool distclean-tags distdir dvi dvi-am html \ distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-data \ html-am info info-am install install-am install-data \
install-data-am install-dvi install-dvi-am install-exec \ install-data-am install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am \ install-exec-am install-html install-html-am install-info \
install-includesHEADERS install-info install-info-am \ install-info-am install-man install-nodist_includesHEADERS \
install-man install-nodist_includesHEADERS install-pdf \ install-pdf install-pdf-am install-ps install-ps-am \
install-pdf-am install-ps install-ps-am install-strip \ install-strip installcheck installcheck-am installdirs \
installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean maintainer-clean-generic mostlyclean \
maintainer-clean-generic mostlyclean mostlyclean-generic \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ tags uninstall uninstall-am uninstall-nodist_includesHEADERS
uninstall-am uninstall-includesHEADERS \
uninstall-nodist_includesHEADERS
# Tell versions [3.59,3.63) of GNU make to not export all variables. # Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded. # Otherwise a system limit (for SysV at least) may be exceeded.