libs/luajit: Further simplify the build system

git-svn-id: svn://tug.org/texlive/trunk@32966 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 17 insertions, 27 deletions

diff --git a/Build/source/libs/luajit/native/Makefile.am b/Build/source/libs/luajit/native/Makefile.am
index 55e159a2adf..07fa7771cfe 100644
--- a/Build/source/libs/luajit/native/Makefile.am
+++ b/Build/source/libs/luajit/native/Makefile.am
@@ -4,17 +4,7 @@
 ## You may freely use, modify and/or distribute this file.
 ##
 AM_CPPFLAGS = -I$(srcdir)/$(LUAJIT_TREE)/src
-AM_CFLAGS = # $(WARNING_CFLAGS)
-
-noinst_DATA = build-flags
-
-build_flags = HOST_CC='$(CC)'
-build_flags += HOST_CFLAGS='$(CFLAGS)'
-build_flags += HOST_LDFLAGS='$(LDFLAGS)'
-build_flags += HOST_LIBS='$(LIBS)'
-
-build-flags: Makefile
-	$(AM_V_GEN)echo "$(build_flags)" >$@
+AM_CFLAGS = -Wall
 
 EXTRA_PROGRAMS = buildvm minilua
 
@@ -23,7 +13,7 @@ all-local: buildvm-stamp
 buildvm-stamp: buildvm$(EXEEXT)
 	$(AM_V_at)echo timestamp >$@
 
-buildvm_CPPFLAGS = $(AM_CPPFLAGS) -DLUAJIT_ENABLE_LUA52COMPAT `cat ../native_flags`
+buildvm_CPPFLAGS = $(AM_CPPFLAGS) $(LUAJIT_DEFINES) `cat ../native_flags`
 nodist_buildvm_SOURCES = \
 	@LUAJIT_TREE@/src/host/buildvm.c \
 	@LUAJIT_TREE@/src/host/buildvm.h \
@@ -31,7 +21,7 @@ nodist_buildvm_SOURCES = \
 	@LUAJIT_TREE@/src/host/buildvm_fold.c \
 	@LUAJIT_TREE@/src/host/buildvm_lib.c \
 	@LUAJIT_TREE@/src/host/buildvm_peobj.c
-$(buildvm_OBJECTS): $(nodist_buildvm_SOURCES) buildvm_arch.h
+$(buildvm_OBJECTS): buildvm_arch.h
 
 buildvm_arch.h: minilua$(EXEEXT) $(LUAJIT_TREE)/dynasm/dynasm.lua
 	$(AM_V_GEN)./minilua $(srcdir)/$(LUAJIT_TREE)/dynasm/dynasm.lua \
@@ -40,7 +30,6 @@ buildvm_arch.h: minilua$(EXEEXT) $(LUAJIT_TREE)/dynasm/dynasm.lua
 
 nodist_minilua_SOURCES = \
 	@LUAJIT_TREE@/src/host/minilua.c
-$(minilua_OBJECTS): $(nodist_minilua_SOURCES)
 minilua_LDFLAGS = $(MATH_LIB)
 
 CLEANFILES = buildvm-stamp buildvm_arch.h
diff --git a/Build/source/libs/luajit/native/Makefile.in b/Build/source/libs/luajit/native/Makefile.in
index 8bf234128e3..4e90661f560 100644
--- a/Build/source/libs/luajit/native/Makefile.in
+++ b/Build/source/libs/luajit/native/Makefile.in
@@ -13,7 +13,6 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
 VPATH = @srcdir@
 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
 am__make_running_with_option = \
@@ -91,6 +90,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/../../../build-aux/missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../../m4/kpse-common.m4 \
+	$(top_srcdir)/../../../m4/kpse-luajit-flags.m4 \
 	$(top_srcdir)/../../../m4/kpse-warnings.m4 \
 	$(top_srcdir)/../version.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -154,7 +154,6 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-DATA = $(noinst_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
 	$(LISP)config.h.in
 # Read a list of newline-separated strings from the standard input,
@@ -223,6 +222,7 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LUAJIT_DEFINES = @LUAJIT_DEFINES@
 LUAJIT_TREE = @LUAJIT_TREE@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -285,11 +285,8 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(srcdir)/$(LUAJIT_TREE)/src
-AM_CFLAGS = # $(WARNING_CFLAGS)
-noinst_DATA = build-flags
-build_flags = HOST_CC='$(CC)' HOST_CFLAGS='$(CFLAGS)' \
-	HOST_LDFLAGS='$(LDFLAGS)' HOST_LIBS='$(LIBS)'
-buildvm_CPPFLAGS = $(AM_CPPFLAGS) -DLUAJIT_ENABLE_LUA52COMPAT `cat ../native_flags`
+AM_CFLAGS = -Wall
+buildvm_CPPFLAGS = $(AM_CPPFLAGS) $(LUAJIT_DEFINES) `cat ../native_flags`
 nodist_buildvm_SOURCES = \
 	@LUAJIT_TREE@/src/host/buildvm.c \
 	@LUAJIT_TREE@/src/host/buildvm.h \
@@ -714,7 +711,7 @@ distcleancheck: distclean
 	       exit 1; } >&2
 check-am: all-am
 check: check-am
-all-am: Makefile $(DATA) config.h all-local
+all-am: Makefile config.h all-local
 installdirs:
 install: install-am
 install-exec: install-exec-am
@@ -840,20 +837,16 @@ uninstall-am:
 	uninstall-am
 
 
-build-flags: Makefile
-	$(AM_V_GEN)echo "$(build_flags)" >$@
-
 all-local: buildvm-stamp
 
 buildvm-stamp: buildvm$(EXEEXT)
 	$(AM_V_at)echo timestamp >$@
-$(buildvm_OBJECTS): $(nodist_buildvm_SOURCES) buildvm_arch.h
+$(buildvm_OBJECTS): buildvm_arch.h
 
 buildvm_arch.h: minilua$(EXEEXT) $(LUAJIT_TREE)/dynasm/dynasm.lua
 	$(AM_V_GEN)./minilua $(srcdir)/$(LUAJIT_TREE)/dynasm/dynasm.lua \
 	  `cat ../dynasm_flags` \
 	  -o $@ $(srcdir)/$(LUAJIT_TREE)/src/vm_$(DASM_ARCH).dasc
-$(minilua_OBJECTS): $(nodist_minilua_SOURCES)
 
 # 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.
diff --git a/Build/source/libs/luajit/native/aclocal.m4 b/Build/source/libs/luajit/native/aclocal.m4
index b42450882df..62977e15511 100644
--- a/Build/source/libs/luajit/native/aclocal.m4
+++ b/Build/source/libs/luajit/native/aclocal.m4
@@ -1184,4 +1184,5 @@ AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
 m4_include([../../../m4/kpse-common.m4])
+m4_include([../../../m4/kpse-luajit-flags.m4])
 m4_include([../../../m4/kpse-warnings.m4])
diff --git a/Build/source/libs/luajit/native/configure b/Build/source/libs/luajit/native/configure
index 93a634118db..35f1d3b9b1a 100755
--- a/Build/source/libs/luajit/native/configure
+++ b/Build/source/libs/luajit/native/configure
@@ -592,6 +592,7 @@ LIBOBJS
 LUAJIT_TREE
 DASM_ARCH
 MATH_LIB
+LUAJIT_DEFINES
 LN_S
 WARNING_CFLAGS
 am__fastdepCC_FALSE
@@ -4359,6 +4360,10 @@ $as_echo "no, using $LN_S" >&6; }
 fi
 
 
+LUAJIT_DEFINES=-DLUAJIT_ENABLE_LUA52COMPAT
+
+
+
 lj_save_LIBS=$LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pow" >&5
 $as_echo_n "checking for library containing pow... " >&6; }
diff --git a/Build/source/libs/luajit/native/configure.ac b/Build/source/libs/luajit/native/configure.ac
index 24c97b91ebf..f023c94b15e 100644
--- a/Build/source/libs/luajit/native/configure.ac
+++ b/Build/source/libs/luajit/native/configure.ac
@@ -18,6 +18,8 @@ KPSE_BASIC([luajit native])
 AC_PROG_CC
 AC_PROG_LN_S
 
+KPSE_LUAJIT_DEFINES
+
 lj_save_LIBS=$LIBS
 AC_SEARCH_LIBS([pow], [m])
 LIBS=$lj_save_LIBS