summaryrefslogtreecommitdiff
path: root/Build/source/libs/luajit
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2015-02-16 14:32:53 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2015-02-16 14:32:53 +0000
commit8a76c4cf53b01a6a34e6c4fe8ac2c531e23503cc (patch)
treef83da7c83bd9925137f9793803e604f66d3cb637 /Build/source/libs/luajit
parentb99e22bb614c3ff22ace371cbd9cb0575f4df20b (diff)
Build system: Use a Makefile fragment for the dist-hook target
git-svn-id: svn://tug.org/texlive/trunk@36292 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/luajit')
-rw-r--r--Build/source/libs/luajit/ChangeLog4
-rw-r--r--Build/source/libs/luajit/Makefile.am8
-rw-r--r--Build/source/libs/luajit/Makefile.in21
3 files changed, 21 insertions, 12 deletions
diff --git a/Build/source/libs/luajit/ChangeLog b/Build/source/libs/luajit/ChangeLog
index ef6d06a0bf2..9f7a72e821f 100644
--- a/Build/source/libs/luajit/ChangeLog
+++ b/Build/source/libs/luajit/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Use the fragment ../../am/dist_hook.am.
+
2014-12-04 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am, configure.ac: Build luajit as (possibly shared)
diff --git a/Build/source/libs/luajit/Makefile.am b/Build/source/libs/luajit/Makefile.am
index 393989fdbb4..c9ce9140986 100644
--- a/Build/source/libs/luajit/Makefile.am
+++ b/Build/source/libs/luajit/Makefile.am
@@ -1,7 +1,7 @@
## Proxy Makefile.am to build LuaJIT for TeX Live.
##
## Copyright (C) 2014 Luigi Scarso <luigi.scarso@gmail.com>
-## Copyright (C) 2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2014, 2015 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
## We want to re-distribute the whole original LuaJIT source tree.
@@ -12,9 +12,9 @@ EXTRA_DIST = $(LUAJIT_TREE)
##
EXTRA_DIST += $(LUAJIT_TREE)-PATCHES
-# in case of an SVN repository
-dist-hook:
- rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name .libs -o -name '*.o' -o -name '*.lo'`
+# Files not to be distributed
+include $(srcdir)/../../am/dist_hook.am
+NEVER_NAMES += $(NEVER_NAMES_SUB) $(NEVER_NAMES_LT)
AM_CPPFLAGS = -I$(srcdir)/$(LUAJIT_TREE)/src $(LUAJIT_DEFINES)
AM_CFLAGS = -Wall
diff --git a/Build/source/libs/luajit/Makefile.in b/Build/source/libs/luajit/Makefile.in
index 0e938d031fe..a0c96569f5f 100644
--- a/Build/source/libs/luajit/Makefile.in
+++ b/Build/source/libs/luajit/Makefile.in
@@ -470,9 +470,10 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/../../am/rebuild.am \
- $(srcdir)/../../am/reconfig.am $(srcdir)/Makefile.in \
- $(srcdir)/config.h.in $(srcdir)/texluajit.pc.in \
+am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
+ $(srcdir)/../../am/rebuild.am $(srcdir)/../../am/reconfig.am \
+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(srcdir)/texluajit.pc.in \
$(top_srcdir)/../../build-aux/compile \
$(top_srcdir)/../../build-aux/config.guess \
$(top_srcdir)/../../build-aux/config.sub \
@@ -660,6 +661,12 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = $(LUAJIT_TREE) $(LUAJIT_TREE)-PATCHES jiterr.exp
+NEVER_DIST = `find . $(NEVER_NAMES)`
+
+# Files not to be distributed
+NEVER_NAMES = -name .svn $(NEVER_NAMES_SUB) $(NEVER_NAMES_LT)
+NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'
+NEVER_NAMES_LT = -o -name .libs -o -name '*.lo'
AM_CPPFLAGS = -I$(srcdir)/$(LUAJIT_TREE)/src $(LUAJIT_DEFINES)
AM_CFLAGS = -Wall
SUBDIRS = . native include
@@ -746,7 +753,7 @@ all: config.h
.SUFFIXES: .c .lo .log .o .obj .s .test .test$(EXEEXT) .trs
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -768,7 +775,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1750,10 +1757,8 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-luajitincludeHEADERS \
.PRECIOUS: Makefile
-
-# in case of an SVN repository
dist-hook:
- rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name .libs -o -name '*.o' -o -name '*.lo'`
+ cd "$(distdir)" && rm -rf $(NEVER_DIST)
$(libtexluajit_la_OBJECTS): $(HDRGEN)