Fall back to previous modules script and just use existing variables.

Author: phabrics

tme-modules.sh.in

@@ -27,11 +27,13 @@ for num; do
 	else
 	    if test $num = "tme_host_${tme_host}.la"; then
 	    	echo "tme_host_${tme_host}=\${top_builddir}/${subdir}" >> $topdir/tme-hosts.txt 
+		host=yes
 		break
 	    fi
 	fi
     done
     if test $num = $2; then continue; fi
-    echo -n "-dlopen \${top_builddir}/${subdir}/$num " >> $topdir/tme-preopen.txt 
-    echo "${subdir}/$num" >> $topdir/tme-modules.txt 
+    if test "x${host}" = x; then
+	echo -n "-dlopen \${top_builddir}/${subdir}/$num " >> $topdir/tme-preopen.txt 
+    fi
 done

tme-modules.txt

@@ -1 +1 @@
-tme_preopen=-dlopen ${top_builddir}/generic/bus/tme_generic.la -dlopen ${top_builddir}/ic/m68k/tme_ic_m68k.la -dlopen ${top_builddir}/ic/sparc/tme_ic_sparc.la -dlopen ${top_builddir}/ic/stp22xx/tme_ic_stp22xx.la -dlopen ${top_builddir}/ic/tme_ic_am9513.la -dlopen ${top_builddir}/ic/tme_ic_z8530.la -dlopen ${top_builddir}/ic/tme_ic_i825x6.la -dlopen ${top_builddir}/ic/tme_ic_isil7170.la -dlopen ${top_builddir}/ic/tme_ic_ncr5380.la -dlopen ${top_builddir}/ic/tme_ic_ncr53c9x.la -dlopen ${top_builddir}/ic/tme_ic_ncr89c105.la -dlopen ${top_builddir}/ic/tme_ic_stp2024.la -dlopen ${top_builddir}/ic/tme_ic_ad184x.la -dlopen ${top_builddir}/ic/tme_ic_mk48txx.la -dlopen ${top_builddir}/ic/tme_ic_nec765.la -dlopen ${top_builddir}/ic/tme_ic_am7930.la -dlopen ${top_builddir}/ic/tme_ic_am7990.la -dlopen ${top_builddir}/ic/tme_ic_lsi64854.la -dlopen ${top_builddir}/ic/tme_ic_mm58167.la -dlopen ${top_builddir}/machine/sun2/tme_machine_sun2.la -dlopen ${top_builddir}/machine/sun3/tme_machine_sun3.la -dlopen ${top_builddir}/machine/sun4/tme_machine_sun4.la -dlopen ${top_builddir}/host/display/gtk/tme_host_gtk.la -dlopen ${top_builddir}/host/display/rfb/tme_host_rfb.la -dlopen ${top_builddir}/host/display/sdl/tme_host_sdl.la -dlopen ${top_builddir}/host/eth/tun/tme_host_tun.la -dlopen ${top_builddir}/host/eth/bsd/tme_host_bsd.la -dlopen ${top_builddir}/host/eth/openvpn/tme_host_openvpn.la -dlopen ${top_builddir}/host/tme_host_posix.la -dlopen ${top_builddir}/bus/multibus/tme_bus_multibus.la -dlopen ${top_builddir}/bus/sbus/tme_bus_sbus.la -dlopen ${top_builddir}/serial/tme_serial_kb.la -dlopen ${top_builddir}/scsi/tme_scsi.la 
+tme_preopen=-dlopen ${top_builddir}/generic/bus/tme_generic.la -dlopen ${top_builddir}/ic/m68k/tme_ic_m68k.la -dlopen ${top_builddir}/ic/sparc/tme_ic_sparc.la -dlopen ${top_builddir}/ic/stp22xx/tme_ic_stp22xx.la -dlopen ${top_builddir}/ic/tme_ic_am9513.la -dlopen ${top_builddir}/ic/tme_ic_z8530.la -dlopen ${top_builddir}/ic/tme_ic_i825x6.la -dlopen ${top_builddir}/ic/tme_ic_isil7170.la -dlopen ${top_builddir}/ic/tme_ic_ncr5380.la -dlopen ${top_builddir}/ic/tme_ic_ncr53c9x.la -dlopen ${top_builddir}/ic/tme_ic_ncr89c105.la -dlopen ${top_builddir}/ic/tme_ic_stp2024.la -dlopen ${top_builddir}/ic/tme_ic_ad184x.la -dlopen ${top_builddir}/ic/tme_ic_mk48txx.la -dlopen ${top_builddir}/ic/tme_ic_nec765.la -dlopen ${top_builddir}/ic/tme_ic_am7930.la -dlopen ${top_builddir}/ic/tme_ic_am7990.la -dlopen ${top_builddir}/ic/tme_ic_lsi64854.la -dlopen ${top_builddir}/ic/tme_ic_mm58167.la -dlopen ${top_builddir}/machine/sun2/tme_machine_sun2.la -dlopen ${top_builddir}/machine/sun3/tme_machine_sun3.la -dlopen ${top_builddir}/machine/sun4/tme_machine_sun4.la -dlopen ${top_builddir}/host/tme_host_posix.la -dlopen ${top_builddir}/bus/multibus/tme_bus_multibus.la -dlopen ${top_builddir}/bus/sbus/tme_bus_sbus.la -dlopen ${top_builddir}/serial/tme_serial_kb.la -dlopen ${top_builddir}/scsi/tme_scsi.la 

tme-preopen.txt

@@ -15,7 +15,7 @@ libtmesh_la_SOURCES = \
 libtmesh_la_LIBADD = $(top_builddir)/libtme/libtme.la
 
 bin_PROGRAMS = tmesh
-tmesh_LDADD = libtmesh.la $(tme_preopen) @TME_HOST_LIBS@
+tmesh_LDADD = libtmesh.la $(tme_preopen) $(TME_HOST_LIBS)
 tmesh_LDFLAGS = -dlpreopen force -dlopen self
 
 EXTRA_DIST = tmesh.sh
@@ -56,9 +56,11 @@ plugins:
 	mkdir -p $(NME_DIR)
 	cp -f $(top_srcdir)/tme/*.txt $(NME_DIR)
 #	find $(top_builddir) -type f -name '*.la' -exec cp '{}' $NME_DIR ';'
-	for mod in `cat "$(top_srcdir)/tme-modules.txt"`; do \
-		echo $$mod ; \
-		cp -f $(top_builddir)/$$mod $(NME_DIR) ; \
+	for mod in $(tme_preopen) $(TME_HOST_LIBS); do \
+		if test $$mod != -dlopen; then \
+			echo $$mod ; \
+			cp -f $$mod $(NME_DIR) ; \
+		fi \
 	done
 	touch plugins