Some Makefile fixups.

phabrics · Mar 23, 2024 · 8b2bdcb · 8b2bdcb
1 parent 4bb6016
commit 8b2bdcb
Show file tree

Hide file tree

Showing 29 changed files with 42 additions and 40 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -6,7 +6,7 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = . $(subdirs) tme libltdl libtme generic ic machine host bus serial scsi tmesh tools
 
-EXTRA_DIST = modules edist
+EXTRA_DIST = modules.mk edist
 pkgdata_DATA = tmeconfig.h tmememory.h
 
 # target to hook into the distribution:

diff --git a/bus/multibus/Makefile.am b/bus/multibus/Makefile.am
@@ -9,4 +9,4 @@ tme_bus_multibus_la_SOURCES = 3c400.c \
 	sun-sc.c
 tme_bus_multibus_la_LIBADD = $(TME_LIBS)
 
-include $(top_srcdir)/modules
+include $(top_srcdir)/modules.mk
diff --git a/bus/sbus/Makefile.am b/bus/sbus/Makefile.am
@@ -8,4 +8,4 @@ tme_bus_sbus_la_SOURCES = \
 	sun-fbs4.c
 tme_bus_sbus_la_LIBADD = $(top_builddir)/machine/sun/libtme-machine-sun.la $(TME_LIBS)
 
-include $(top_srcdir)/modules
+include $(top_srcdir)/modules.mk
diff --git a/generic/Makefile.am b/generic/Makefile.am
@@ -28,9 +28,9 @@ noinst_SCRIPTS = float-auto.sh \
 
 BUILT_SOURCES =	$(noinst_SCRIPTS:.sh=.c)
 
-CLEANFILES = $(noinst_SCRIPTS) $(BUILT_SOURCES)
+MAINTAINERCLEANFILES = $(noinst_SCRIPTS) $(BUILT_SOURCES)
 
-EXTRA_DIST = $(CLEANFILES) $(noinst_SCRIPTS:.sh=.m4) fb-xlat-auto.pl
+EXTRA_DIST = $(MAINTAINERCLEANFILES) $(noinst_SCRIPTS:.sh=.m4) fb-xlat-auto.pl
 
 # default rule for regenerating the portable shell scripts from m4 descriptions
 $(addprefix $(srcdir)/,$(noinst_SCRIPTS)): %.sh: %.m4

diff --git a/generic/bus/Makefile.am b/generic/bus/Makefile.am
@@ -11,4 +11,4 @@ pkglib_LTLIBRARIES = tme_generic.la
 tme_generic_la_SOURCES = bus-el.c
 tme_generic_la_LIBADD = $(TME_LIBS)
 
-include $(top_srcdir)/modules
+include $(top_srcdir)/modules.mk
diff --git a/host/Makefile.am b/host/Makefile.am
@@ -11,6 +11,6 @@ tme_host_posix_la_SOURCES = posix-memory.c \
 
 tme_host_posix_la_LIBADD = $(TME_LIBS)
 
-include $(top_srcdir)/modules
+include $(top_srcdir)/modules.mk
 
 SUBDIRS = display eth
diff --git a/host/display/Makefile.am b/host/display/Makefile.am
@@ -20,6 +20,6 @@ keymap.h: keymap-def.h
 	  cp $< $@
 endif
 
-include $(top_srcdir)/modules
+include $(top_srcdir)/modules.mk
 
 DIST_SUBDIRS=gtk rfb sdl
diff --git a/host/display/gtk/Makefile.am b/host/display/gtk/Makefile.am
@@ -9,4 +9,4 @@ pkglib_LTLIBRARIES = tme_host_gtk.la
 tme_host_gtk_la_SOURCES = gtk-mouse.c gtk-keyboard.c gtk-display.c gtk-display.h
 tme_host_gtk_la_LIBADD = ../libtme-display.la $(GTK_LIBS) $(TME_LIBS)
 
-include $(top_srcdir)/modules
+include $(top_srcdir)/modules.mk
diff --git a/host/display/rfb/Makefile.am b/host/display/rfb/Makefile.am
@@ -17,4 +17,4 @@ tme_host_rfb_la_CPPFLAGS += $(SDL_CFLAGS)
 tme_host_rfb_la_LIBADD += $(SDL_LIBS)
 endif
 
-include $(top_srcdir)/modules
+include $(top_srcdir)/modules.mk
diff --git a/host/display/sdl/Makefile.am b/host/display/sdl/Makefile.am
@@ -9,4 +9,4 @@ pkglib_LTLIBRARIES = tme_host_sdl.la
 tme_host_sdl_la_SOURCES = sdl-display.c
 tme_host_sdl_la_LIBADD = ../libtme-display.la $(SDL_LIBS) $(TME_LIBS)
 
-include $(top_srcdir)/modules
+include $(top_srcdir)/modules.mk
diff --git a/host/eth/Makefile.am b/host/eth/Makefile.am
@@ -8,6 +8,6 @@ libtme_eth_la_SOURCES = eth-impl.c eth-if.h
 libtme_eth_la_LDFLAGS = -version-info 0:0:0
 libtme_eth_la_LIBADD = $(TME_LIBS)
 
-include $(top_srcdir)/modules
+include $(top_srcdir)/modules.mk
 
 DIST_SUBDIRS=bsd openvpn tun
diff --git a/host/eth/bsd/Makefile.am b/host/eth/bsd/Makefile.am
@@ -9,4 +9,4 @@ pkglib_LTLIBRARIES = tme_host_bsd.la
 tme_host_bsd_la_SOURCES = bsd-bpf.c
 tme_host_bsd_la_LIBADD = ../libtme-eth.la $(TME_LIBS)
 
-include $(top_srcdir)/modules
+include $(top_srcdir)/modules.mk
diff --git a/host/eth/openvpn/Makefile.am b/host/eth/openvpn/Makefile.am
@@ -15,4 +15,4 @@ if WIN32
 tme_host_openvpn_la_LIBADD += -lgdi32 -lws2_32 -lwininet -lcrypt32 -liphlpapi -lwinmm
 endif
 
-include $(top_srcdir)/modules
+include $(top_srcdir)/modules.mk
diff --git a/host/eth/tun/Makefile.am b/host/eth/tun/Makefile.am
@@ -9,4 +9,4 @@ pkglib_LTLIBRARIES = tme_host_tun.la
 tme_host_tun_la_SOURCES = tun-tap.c
 tme_host_tun_la_LIBADD = ../libtme-eth.la $(NATLIBS) $(TME_LIBS)
 
-include $(top_srcdir)/modules
+include $(top_srcdir)/modules.mk
diff --git a/ic/Makefile.am b/ic/Makefile.am
@@ -66,4 +66,4 @@ tme_ic_am7990_la_LIBADD = $(TME_LIBS)
 tme_ic_lsi64854_la_SOURCES = lsi64854.c
 tme_ic_lsi64854_la_LIBADD = $(TME_LIBS)
 
-include $(top_srcdir)/modules
+include $(top_srcdir)/modules.mk
diff --git a/ic/ieee754/Makefile.am b/ic/ieee754/Makefile.am
@@ -17,9 +17,9 @@ AM_CFLAGS = @CFLAGS_NO_STRICT_ALIASING@
 
 noinst_SCRIPTS = ieee754-misc-auto.sh ieee754-ops-auto.sh ieee754-precision.sh 
 BUILT_SOURCES = ieee754-auto.h ieee754-ops-auto.h ieee754-misc-auto.c
-CLEANFILES = $(noinst_SCRIPTS) $(BUILT_SOURCES) ieee754-ops-auto.c
+MAINTAINERCLEANFILES = $(noinst_SCRIPTS) $(BUILT_SOURCES) ieee754-ops-auto.c
 
-EXTRA_DIST = $(CLEANFILES) $(noinst_SCRIPTS:.sh=.m4) softfloat-tme.h
+EXTRA_DIST = $(MAINTAINERCLEANFILES) $(noinst_SCRIPTS:.sh=.m4) softfloat-tme.h
 
 # default rule for regenerating the portable shell scripts from m4 descriptions
 $(addprefix $(srcdir)/,$(noinst_SCRIPTS)): %.sh: %.m4
@@ -41,4 +41,4 @@ $(srcdir)/ieee754-ops-auto.h: ieee754-ops-auto.sh ieee754-precision.sh
 $(srcdir)/ieee754-ops-auto.c: ieee754-ops-auto.sh ieee754-precision.sh
 	$(SHELL) $< > $@
 
-include $(top_srcdir)/modules
+include $(top_srcdir)/modules.mk
diff --git a/ic/m68k/Makefile.am b/ic/m68k/Makefile.am
@@ -19,11 +19,11 @@ noinst_SCRIPTS = m68k-misc-auto.sh \
 	m68k-bus-auto.sh \
 	m6888x-auto.sh
 
-BUILT_SOURCES = $(noinst_SCRIPTS) m68k-auto.h m68k-opmap.c m68k-insns-auto.c m68k-bus-auto.c m6888x-auto.c
-CLEANFILES = $(BUILT_SOURCES)
+BUILT_SOURCES = m68k-auto.h m68k-opmap.c m68k-insns-auto.c m68k-bus-auto.c m6888x-auto.c
+MAINTAINERCLEANFILES = $(noinst_SCRIPTS) $(BUILT_SOURCES)
 
 EXTRA_DIST = m68k-impl.h \
-	$(BUILT_SOURCES) \
+	$(MAINTAINERCLEANFILES) \
 	$(noinst_SCRIPTS:.sh=.m4)  \
 	m68k-execute.c \
 	m68k-iset-expand.pl \
@@ -66,4 +66,4 @@ $(pkglib_LTLIBRARIES): ../ieee754/libtme-ieee754.la
 	cd `dirname $@` && $(MAKE) `basename $@`
 force: ;
 
-include $(top_srcdir)/modules
+include $(top_srcdir)/modules.mk
diff --git a/ic/sparc/Makefile.am b/ic/sparc/Makefile.am
@@ -21,11 +21,11 @@ noinst_SCRIPTS = sparc-misc-auto.sh \
 	sparc-fpu-auto.sh \
 	sparc-vis-auto.sh \
 	sparc-bus-auto.sh
-BUILT_SOURCES = $(noinst_SCRIPTS) sparc-auto.h sparc-insns-auto.c sparc-bus-auto.c sparc-fpu-auto.c sparc-vis-auto.c
-CLEANFILES = $(BUILT_SOURCES)
+BUILT_SOURCES = sparc-auto.h sparc-insns-auto.c sparc-bus-auto.c sparc-fpu-auto.c sparc-vis-auto.c
+MAINTAINERCLEANFILES = $(noinst_SCRIPTS) $(BUILT_SOURCES)
 
 EXTRA_DIST = sparc-impl.h \
-	$(BUILT_SOURCES) \
+	$(MAINTAINERCLEANFILES) \
 	$(noinst_SCRIPTS:.sh=.m4)  \
 	sparc-execute.c \
 	sparc-rc-cc.c \
@@ -66,4 +66,4 @@ $(pkglib_LTLIBRARIES): ../ieee754/libtme-ieee754.la
 	cd `dirname $@` && $(MAKE) `basename $@`
 force: ;
 
-include $(top_srcdir)/modules
+include $(top_srcdir)/modules.mk
diff --git a/ic/stp22xx/Makefile.am b/ic/stp22xx/Makefile.am
@@ -19,4 +19,4 @@ tme_ic_stp22xx_la_LIBADD = $(TME_LIBS)
 EXTRA_DIST = stp222x-impl.h \
 	stp22xx-impl.h
 
-include $(top_srcdir)/modules
+include $(top_srcdir)/modules.mk
diff --git a/libopenvpn/Makefile.am b/libopenvpn/Makefile.am
@@ -180,3 +180,7 @@ nobase_pkginclude_HEADERS = \
 	win32.h
 
 SUBDIRS = lib
+
+.PHONY: modules
+
+modules:
diff --git a/libtme/Makefile.am b/libtme/Makefile.am
@@ -49,11 +49,11 @@ noinst_SCRIPTS = memory-auto.sh
 
 BUILT_SOURCES = memory-auto.h memory-auto.c
 
-CLEANFILES = $(noinst_SCRIPTS) $(BUILT_SOURCES)
+MAINTAINERCLEANFILES = $(noinst_SCRIPTS) $(BUILT_SOURCES)
 
 EXTRA_DIST = log-prf.c \
 	misc.c \
-	$(CLEANFILES) \
+	$(MAINTAINERCLEANFILES) \
 	$(noinst_SCRIPTS:.sh=.m4) 
 
 # default rule for regenerating the portable shell scripts from m4 descriptions

diff --git a/machine/sun/Makefile.am b/machine/sun/Makefile.am
@@ -30,4 +30,4 @@ tme-sun-idprom: tme-sun-idprom.pl
 tme-sun-eeprom: tme-sun-eeprom.pl $(top_srcdir)/tools/tme-binary-struct.pl.in
 	cat $(top_srcdir)/tools/tme-binary-struct.pl.in $(srcdir)/tme-sun-eeprom.pl | \
 	sed -e s%/usr/pkg/bin/perl%$(PERL)% > $@
-include $(top_srcdir)/modules
+include $(top_srcdir)/modules.mk
diff --git a/machine/sun2/Makefile.am b/machine/sun2/Makefile.am
@@ -15,4 +15,4 @@ tme_machine_sun2_la_LIBADD = ../sun/libtme-machine-sun.la $(TME_LIBS)
 examplesdir = $(pkgdatadir)/examples
 dist_examples_DATA = SUN2-MULTIBUS
 
-include $(top_srcdir)/modules
+include $(top_srcdir)/modules.mk
diff --git a/machine/sun3/Makefile.am b/machine/sun3/Makefile.am
@@ -15,4 +15,4 @@ tme_machine_sun3_la_LIBADD = ../sun/libtme-machine-sun.la $(TME_LIBS)
 examplesdir = $(pkgdatadir)/examples
 dist_examples_DATA = SUN3-CARRERA sun3-carrera-eeprom.txt
 
-include $(top_srcdir)/modules
+include $(top_srcdir)/modules.mk
diff --git a/machine/sun4/Makefile.am b/machine/sun4/Makefile.am
@@ -19,4 +19,4 @@ tme_machine_sun4_la_LIBADD = ../sun/libtme-machine-sun.la $(TME_LIBS)
 examplesdir = $(pkgdatadir)/examples
 dist_examples_DATA = SUN4-75
 
-include $(top_srcdir)/modules
+include $(top_srcdir)/modules.mk
diff --git a/modules → modules.mk b/modules → modules.mk
diff --git a/scsi/Makefile.am b/scsi/Makefile.am
@@ -23,4 +23,4 @@ tme_scsi_la_SOURCES = \
 	scsi-bus.c
 tme_scsi_la_LIBADD = $(TME_LIBS)
 
-include $(top_srcdir)/modules
+include $(top_srcdir)/modules.mk
diff --git a/serial/Makefile.am b/serial/Makefile.am
@@ -18,4 +18,4 @@ tme_serial_kb_la_SOURCES = \
 	ms-mssystems.c
 tme_serial_kb_la_LIBADD = $(TME_LIBS)
 
-include $(top_srcdir)/modules
+include $(top_srcdir)/modules.mk
diff --git a/tmesh/Makefile.am b/tmesh/Makefile.am
@@ -5,17 +5,15 @@ AUTOMAKE_OPTIONS = 1.4 gnu
 
 AM_CPPFLAGS = -I$(top_srcdir) -D_TME_IMPL @TME_HOST_CFLAGS@
 
-noinst_LTLIBRARIES = libtmesh.la
-libtmesh_la_SOURCES = \
+tmesh_SOURCES = tmesh.c \
 	tmesh-impl.h \
 	tmesh-input.y \
 	tmesh-util.c \
 	tmesh-cmds.c \
 	tmesh-threads.c
-libtmesh_la_LIBADD = $(top_builddir)/libtme/libtme.la
 
 bin_PROGRAMS = tmesh
-tmesh_LDADD = libtmesh.la $(tme_preopen) $(TME_HOST_LIBS)
+tmesh_LDADD = $(top_builddir)/libtme/libtme.la $(tme_preopen) $(TME_HOST_LIBS)
 tmesh_LDFLAGS = -dlpreopen force -dlopen self
 
 EXTRA_DIST = tmesh.sh