Commit: c754103d7514f92a07c68b43b6d26d9823ffe4d8 - phabrics (git)

Commit MetaInfo

• Revision: c754103d7514f92a07c68b43b6d26d9823ffe4d8 (tree)
• Time: 2022-04-23 21:07:05
• Author: phabrics <phabrics@phab...>
• Commiter: phabrics

Log Message

Dependency fixes for generated source files to be properly handled by concurrent builds.

Change Summary

• modified: contrib/tme-0.8/configure.ac
• modified: contrib/tme-0.8/generic/Makefile.am
• modified: contrib/tme-0.8/host/Makefile.am
• modified: contrib/tme-0.8/ic/ieee754/Makefile.am
• modified: contrib/tme-0.8/libtme/Makefile.am
• modified: contrib/tme-0.8/modules

Incremental Difference

--- a/contrib/tme-0.8/configure.ac
+++ b/contrib/tme-0.8/configure.ac
@@ -1164,7 +1164,6 @@ LT_INIT([dlopen,win32-dll])
 LT_LANG([Windows Resource])
 LTDL_INIT([recursive installable])
 CPPFLAGS="${CPPFLAGS-} ${LTDLINCL}"
-AM_CONDITIONAL([USING_PREOPEN], [test "x${enable_static}" = "xyes"])
 
 AC_ARG_VAR([IFCONFIG], [full path to ipconfig utility])
 AC_ARG_VAR([ROUTE], [full path to route utility])
@@ -1602,4 +1601,3 @@ AC_CONFIG_FILES([Makefile
 	  tmesh/Makefile
 	  tools/Makefile])
 AC_OUTPUT
-

--- a/contrib/tme-0.8/generic/Makefile.am
+++ b/contrib/tme-0.8/generic/Makefile.am
@@ -22,19 +22,15 @@ libtme_generic_la_SOURCES = bus.c \
 libtme_generic_la_LDFLAGS = -version-info 0:0:0
 libtme_generic_la_LIBADD = $(top_builddir)/libtme/libtme.la
 
-noinst_SCRIPTS = fb-xlat-auto.sh \
-	 	float-auto.sh \
-		bus-device-auto.sh
+noinst_SCRIPTS = float-auto.sh \
+		bus-device-auto.sh \
+		fb-xlat-auto.sh
 
-CLEANFILES = $(noinst_SCRIPTS)
+BUILT_SOURCES =	$(noinst_SCRIPTS:.sh=.c)
 
-BUILT_SOURCES =	$(noinst_SCRIPTS)
+CLEANFILES = $(noinst_SCRIPTS) $(BUILT_SOURCES)
 
-EXTRA_DIST = $(noinst_SCRIPTS) \
-	$(noinst_SCRIPTS:.sh=.m4) \
-	float-auto.c \
-	bus-device-auto.c \
-	fb-xlat-auto.pl
+EXTRA_DIST = $(CLEANFILES) $(noinst_SCRIPTS:.sh=.m4)
 
 # default rule for regenerating the portable shell scripts from m4 descriptions
 $(noinst_SCRIPTS): %.sh: %.m4
@@ -57,15 +53,6 @@ fb-xlat-auto.c: %.c: %.sh
 	$(SHELL) $< src $(TME_FB_XLAT_SRC) dst $(TME_FB_XLAT_DST) > $@
 endif
 
-# fb.lo depends on fb-xlat-auto.c:
-fb.lo: fb-xlat-auto.c
-
-# float.lo depends on float-auto.c:
-float.lo: float-auto.c
-
-# bus-device.lo depends on bus-device-auto.c:
-bus-device.lo: bus-device-auto.c
-
 pkglib_LTLIBRARIES = tme_generic.la
 tme_generic_la_SOURCES = bus-el.c
 tme_generic_la_LDFLAGS = -module -version-info 0:0:0

--- a/contrib/tme-0.8/host/Makefile.am
+++ b/contrib/tme-0.8/host/Makefile.am
@@ -11,8 +11,6 @@ libtme_host_la_LIBADD = $(top_builddir)/generic/libtme-generic.la $(GTK_LIBS)
 
 EXTRA_DIST = keymap-make.pl keymap-def.h
 
-display-keyboard.lo:  keymap.h
-
 BUILT_SOURCES = keymap.h
 CLEANFILES = keymap.h
 if USING_X

--- a/contrib/tme-0.8/ic/ieee754/Makefile.am
+++ b/contrib/tme-0.8/ic/ieee754/Makefile.am
@@ -18,10 +18,10 @@ libtme_ieee754_la_LIBADD = $(top_builddir)/generic/libtme-generic.la
 AM_CFLAGS = @CFLAGS_NO_STRICT_ALIASING@
 
 noinst_SCRIPTS = ieee754-misc-auto.sh ieee754-ops-auto.sh ieee754-precision.sh 
-BUILT_SOURCES = $(noinst_SCRIPTS) ieee754-auto.h ieee754-ops-auto.h
-CLEANFILES = $(BUILT_SOURCES)
+BUILT_SOURCES = ieee754-auto.h ieee754-ops-auto.h ieee754-misc-auto.c
+CLEANFILES = $(noinst_SCRIPTS) $(BUILT_SOURCES) ieee754-ops-auto.c
 
-EXTRA_DIST = $(noinst_SCRIPTS) $(noinst_SCRIPTS:.sh=.m4) softfloat-tme.h
+EXTRA_DIST = $(CLEANFILES) $(noinst_SCRIPTS:.sh=.m4) softfloat-tme.h
 
 # default rule for regenerating the portable shell scripts from m4 descriptions
 $(noinst_SCRIPTS): %.sh: %.m4
@@ -43,5 +43,3 @@ ieee754-ops-auto.h: ieee754-ops-auto.sh ieee754-precision.sh
 ieee754-ops-auto.c: ieee754-ops-auto.sh ieee754-precision.sh
 	$(SHELL) $< > $@
 
-# ieee754-misc.lo depends on ieee754-misc-auto.c:
-ieee754-misc.lo: ieee754-misc-auto.c

--- a/contrib/tme-0.8/libtme/Makefile.am
+++ b/contrib/tme-0.8/libtme/Makefile.am
@@ -47,12 +47,13 @@ endif
 
 noinst_SCRIPTS = memory-auto.sh
 
-BUILT_SOURCES = $(noinst_SCRIPTS)
-CLEANFILES = $(noinst_SCRIPTS)
+BUILT_SOURCES = shlibvar.h memory-auto.h memory-auto.c
+
+CLEANFILES = $(noinst_SCRIPTS) $(BUILT_SOURCES)
 
 EXTRA_DIST = log-prf.c \
 	misc.c \
-	$(noinst_SCRIPTS) \
+	$(CLEANFILES) \
 	$(noinst_SCRIPTS:.sh=.m4) 
 
 # default rule for regenerating the portable shell scripts from m4 descriptions
@@ -67,11 +68,8 @@ memory-auto.h: memory-auto.sh
 memory-auto.c: memory-auto.sh
 	$(SHELL) $< > $@
 
-memory-auto.lo: memory-auto.h
-
 # module.c needs to know the LTDL_SHLIBPATH_VAR that libltdl
 # is using:
-module.lo: shlibvar.h
 shlibvar.h: $(top_builddir)/config.h Makefile
 	grep LT_MODULE_PATH_VAR $(top_builddir)/config.h > $@
 	grep LT_DLSEARCH_PATH $(top_builddir)/config.h >> $@

--- a/contrib/tme-0.8/modules
+++ b/contrib/tme-0.8/modules
@@ -107,10 +107,3 @@ modules-local:
 # module.c can find the uninstalled tme-plugins.txt file, and libtool
 # will want to look in this directory for .la files, so we simply copy
 # all of the .la files into that same directory:
-all-local:
-	@if test "x$(pkglib_LTLIBRARIES)" != x; then		\
-	    for module in $(pkglib_LTLIBRARIES); do		\
-		echo $$module ;					\
-		cp $$module $(top_builddir)/tme ;		\
-	    done ;						\
-	fi