Commit: eb13a2411a6f093212e56113a7de8a5226dd621c - tme (git)

Commit MetaInfo

• Revision: eb13a2411a6f093212e56113a7de8a5226dd621c (tree)
• Time: 2022-11-12 20:49:04
• Author: phabrics <phabrics@phab...>
• Commiter: phabrics

Log Message

Changes to enable conditional compilation of host modules.

Change Summary

• modified: Makefile.am
• modified: bus/Makefile.am
• modified: bus/multibus/Makefile.am
• modified: bus/sbus/Makefile.am
• modified: configure.ac
• modified: generic/Makefile.am
• add: generic/bus/Makefile.am
• delete: generic/{ => bus}/bus-el.c
• modified: host/Makefile.am
• modified: host/display/Makefile.am
• modified: host/display/gtk/Makefile.am
• modified: host/display/rfb/Makefile.am
• modified: host/display/sdl/Makefile.am
• modified: host/eth/Makefile.am
• modified: host/eth/bsd/Makefile.am
• modified: host/eth/openvpn/Makefile.am
• modified: host/eth/tun/Makefile.am
• modified: ic/Makefile.am
• modified: ic/ieee754/Makefile.am
• modified: ic/m68k/Makefile.am
• modified: ic/sparc/Makefile.am
• modified: ic/stp22xx/Makefile.am
• modified: libtme/Makefile.am
• modified: machine/Makefile.am
• modified: machine/sun/Makefile.am
• modified: machine/sun2/Makefile.am
• modified: machine/sun3/Makefile.am
• modified: machine/sun4/Makefile.am
• modified: modules
• modified: scsi/Makefile.am
• modified: serial/Makefile.am
• add: tme-hosts.txt
• add: tme-modules.sh.in
• modified: tme-preopen.txt
• modified: tme/tme-plugins.txt
• modified: tmesh/Makefile.am

Incremental Difference

--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ endif
 tap-windows.h: tap-windows-def.h
 	cp $< $@
 
-if USING_OPENVPN
+if HAVE_OPENVPN
 SUBDIRS = . libopenvpn
 else
 SUBDIRS = 
@@ -31,5 +31,9 @@ dist-hook:
 # so that future builds will track all module dependencies.
 # If new modules are added, "make modules" must be run to update this list in the source.
 modules-local:
-	rm -f ${top_srcdir}/tme/tme-plugins.txt
-	echo -n LDADD = > $(top_srcdir)/tme-preopen.txt 
+	@if test ! -e .modules; then \
+		rm -f ${top_srcdir}/tme/tme-plugins.txt ${top_srcdir}/tme-hosts.txt ; \
+		echo -n tme_preopen=> $(top_srcdir)/tme-preopen.txt ; \
+		chmod +x tme-modules.sh ; \
+		touch .modules ; \
+	fi

--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -3,6 +3,5 @@
 
 AUTOMAKE_OPTIONS = 1.4 gnu
 
-SUBDIRS = @TME_BUS_SUBDIRS@
-DIST_SUBDIRS = multibus sbus
+SUBDIRS = multibus sbus
 

--- a/bus/multibus/Makefile.am
+++ b/bus/multibus/Makefile.am
@@ -9,7 +9,6 @@ pkglib_LTLIBRARIES = tme_bus_multibus.la
 tme_bus_multibus_la_SOURCES = 3c400.c \
 	sun-mie.c \
 	sun-sc.c
-tme_bus_multibus_la_LDFLAGS = -module -version-info 0:0:0
-tme_bus_multibus_la_LIBADD = $(top_builddir)/generic/libtme-generic.la
+tme_bus_multibus_la_LIBADD = $(TME_LIBS)
 
 include $(top_srcdir)/modules

--- a/bus/sbus/Makefile.am
+++ b/bus/sbus/Makefile.am
@@ -8,7 +8,6 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) -I$(top_srcdir)/lib -I. -D_TME_IMPL
 pkglib_LTLIBRARIES = tme_bus_sbus.la
 tme_bus_sbus_la_SOURCES = \
 	sun-fbs4.c
-tme_bus_sbus_la_LDFLAGS = -module -version-info 0:0:0
-tme_bus_sbus_la_LIBADD = $(top_builddir)/machine/sun/libtme-machine-sun.la
+tme_bus_sbus_la_LIBADD = $(top_builddir)/machine/sun/libtme-machine-sun.la $(TME_LIBS)
 
 include $(top_srcdir)/modules

--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,7 @@ dnl POSSIBILITY OF SUCH DAMAGE.
 dnl Checks that we are given a good source directory.
 AC_PREREQ([2.68])
 m4_include(version.m4)
-AC_INIT([tme], [0.12rc7])
+AC_INIT([tme], [0.12rc8])
 AC_CONFIG_SRCDIR([ic/m68k/m68k-impl.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_TARGET
@@ -764,16 +764,7 @@ AC_CHECK_DECLS(
 )
 CFLAGS="${old_CFLAGS}"
 
-dnl Checks for GLIB.
-AM_PATH_GLIB_2_0([], have_glib=yes, have_glib=no)
-if test "x$have_glib" = xyes; then
-  AC_DEFINE(HAVE_GLIB, [], [Define if you are compiling with GLIB.])
-fi
-
 TME_FB_XLAT_DST=
-dnl Checks for GTK.
-AM_PATH_GTK_3_0([], have_gtk=yes, have_gtk=no)
-AM_PATH_SDL2([], have_sdl=yes, have_sdl=no)
 
 # if --with-tme-host-displays is given, characterize those given displays:
 AC_ARG_WITH(tme-host-displays,
@@ -782,70 +773,46 @@ AC_ARG_WITH(tme-host-displays,
 
 AC_SUBST(TME_FB_XLAT_DST)
 
-tme_host_types="gtk rfb sdl tun bsd openvpn"
-
-for tme_host_type in ${tme_host_types}; do
-    eval enable_${tme_host_type}=no
-done
+TME_HOST_TYPES="gtk rfb sdl tun bsd openvpn"
+AC_SUBST(TME_HOST_TYPES)
 
 AC_ARG_ENABLE(hosts,
-[  --enable-hosts=hosttypes         enable hosts (default="${tme_host_types}")],
-   [tme_host_types=${enableval}], [enable_hosts=yes])
+[  --enable-hosts=hosttypes         enable hosts (default="$TME_HOST_TYPES")],
+   [tme_enable_hosts=${enableval}], [enable_hosts=yes])
 
-if test "x${enable_hosts}" = xno; then
-   tme_host_types=
+if test "x${enable_hosts}" = xyes; then
+   tme_enable_hosts=$TME_HOST_TYPES
 fi
 
-for tme_host_type in ${tme_host_types}; do
+for tme_host_type in ${tme_enable_hosts}; do
     eval enable_${tme_host_type}=yes
 done
 
 dnl Start the list of display host support.
-TME_DISPLAY_HOSTS=
 TME_FB_XLAT_DST="d32b32s0p32olml_r0xffff0000_g0xff00ff00_b0xff0000ff d24b32s0p32olml_r0xff0000_g0xff00_b0xff"
 
-if test "x$have_gtk" = xyes; then
-   if test "x${enable_gtk}" = xyes; then
-      TME_DISPLAY_HOSTS="gtk ${TME_DISPLAY_HOSTS}"
-   fi
-#   TME_FB_XLAT_DST="d32b32s0p32olml_r0xffff0000_g0xff00ff00_b0xff0000ff d24b32s0p32olml_r0xff0000_g0xff00_b0xff d16b16s0p32olml_r0xf800_g0x07e0_b0x001f d8b8s0p32olml_r0xff_g0xff_b0xff d1b1s0p32olml_r0x1_g0x1_b0x1"
-fi
-
-if test "x$have_sdl" = xyes; then
-   if test "x${enable_sdl}" = xyes; then
-      TME_DISPLAY_HOSTS="sdl ${TME_DISPLAY_HOSTS}"
-   fi
-fi
-
-AS_IF([test "x${enable_rfb}" = xyes], [
-   PKG_CHECK_MODULES([RFB], [libvncclient libvncserver], [TME_DISPLAY_HOSTS="rfb ${TME_DISPLAY_HOSTS}"], AC_DEFINE([HAVE_RFB], [0], [No RFB]))
-])
-
-dnl The list of display host support is finished.
-AC_SUBST(TME_DISPLAY_HOSTS)
+dnl Checks for GLIB.
+AM_PATH_GLIB_2_0([], [have_glib=$enable_glib], [])
 
-AC_MSG_RESULT($TME_DISPLAY_HOSTS)
+dnl Checks for display type support
+AM_PATH_GTK_3_0([], [have_gtk=$enable_gtk], [])
+AM_PATH_SDL2([], [have_sdl=$enable_sdl], [])
+PKG_CHECK_MODULES([RFB], [libvncclient libvncserver], [have_rfb=$enable_rfb], [])
 
 dnl Start the list of ethernet host support.
-TME_ETH_HOSTS=
-
 AM_CONDITIONAL([USE_TAP_WINDOWS], [test "x${enable_openvpn}" = xyes && test "x${have_tap_header}" = x && test "x${WIN32}" != x])
-AM_CONDITIONAL([USING_OPENVPN], [test "x${enable_openvpn}" = xyes && test "x${have_tap_header}" = xyes || test "x${WIN32}" != x])
+
 if test "x${enable_openvpn}" = xyes && test "x${have_tap_header}" = xyes || test "x${WIN32}" != x; then
-   TME_ETH_HOSTS="openvpn ${TME_ETH_HOSTS}"
+   have_openvpn=yes
    AC_DEFINE([OPENVPN_VERSION_RESOURCE], [PRODUCT_VERSION_RESOURCE], [Version in windows resource format])
 fi
+AM_CONDITIONAL([HAVE_OPENVPN], [test "x${have_openvpn}" = xyes])
 
 AC_CHECK_HEADERS([linux/if_tun.h net/if_tap.h net/tap/if_tap.h net/if_tun.h],
-		 [if test "x${enable_tun}" = xyes; then
-		     TME_ETH_HOSTS="tun ${TME_ETH_HOSTS}"
-		  fi])
+		 [have_tun=$enable_tun])
 
 AC_CHECK_HEADERS([linux/filter.h net/bpf.h])
 
-dnl Checks for host support.
-AC_MSG_CHECKING([for host support types])
-
 AC_EGREP_CPP(found_BPFVERSION,
 [
 #ifdef HAVE_LINUX_FILTER_H
@@ -857,18 +824,23 @@ AC_EGREP_CPP(found_BPFVERSION,
 found_BPFVERSION
 #endif
 ],
-[if test "x${enable_bsd}" = xyes; then
-    TME_ETH_HOSTS="bsd ${TME_ETH_HOSTS}"
- fi])
+[have_bsd=$enable_bsd])
 
-if test "x${TME_ETH_HOSTS}" != x; then
-   TME_ETH_HOSTS="${TME_ETH_HOSTS}"
-fi
+for tme_host in $TME_HOST_TYPES; do
+    if eval test "x\$have_${tme_host}" = xyes; then
+       TME_HOSTS="-dlopen \$(tme_host_${tme_host})/tme_host_${tme_host}.la ${TME_HOSTS}"
+       TME_HOSTS_DIRS="\$(tme_host_${tme_host}) ${TME_HOSTS_DIRS}"
+    fi
+done
+
+dnl Checks for host support.
+AC_MSG_CHECKING([for host support types])
 
 dnl The list of ethernet host support is finished.
-AC_SUBST(TME_ETH_HOSTS)
+AC_SUBST(TME_HOSTS)
+AC_SUBST(TME_HOSTS_DIRS)
 
-AC_MSG_RESULT($TME_ETH_HOSTS)
+AC_MSG_RESULT($TME_HOSTS)
 
 AC_SYS_POSIX_TERMIOS
 
@@ -958,111 +930,10 @@ AM_CONDITIONAL([THREADS_SJLJ], [test "x${tme_thread_types}" = xsjlj])
 AC_MSG_RESULT($tme_thread_types)
 
 dnl Configures for the system(s) to emulate.
-systems=all
-if echo " ${systems} " | grep ' all ' > /dev/null 2>&1; then
-  systems="sun2 sun3 sun4 sunultra1"
-  bus_size_max=64
-  recode_size_guest_max=64
-fi
-TME_MACHINE_SUBDIRS=
-TME_IC_SUBDIRS=ieee754
-TME_ICS=
-TME_SERIAL_SUBDIRS=
-TME_SERIALS=
-TME_BUS_SUBDIRS=
-TME_FB_XLAT_SRC=
-for system in $systems; do
-
-    # dispatch on the machine type to get more machines, ICs, and
-    # buses to compile:
-    case ${system} in
-
-    # the sun2:
-    sun2)
-	machines="sun sun2"
-	ics="m68k am9513 mm58167 z8530 i825x6"
-	buses="multibus"
-	fb_xlats="1152x900d1b1s0p32om"
-	;;
-
-    # the sun3:
-    sun3)
-	machines="sun sun3"
-	ics="m68k isil7170 z8530 i825x6 ieee754 ncr5380"
-	buses="multibus"
-	fb_xlats="1152x900d1b1s0p32om 1152x900d8b8s0p32ommi8 1152x900d1b1s0p32omccmi8"
-	;;
-
-    # the sun4:
-    sun4)
-	machines="sun sun4"
-	ics="sparc isil7170 z8530 am7930 am7990 ieee754 ncr53c9x mk48txx lsi64854 nec765"
-	buses="sbus"
-	fb_xlats="1152x900d1b1s0p32om 1152x900d8b8s0p32ommi8 1152x900d1b1s0p32omccmi8"
-	;;
-
-    # the sun Ultra-1:
-    sunultra1)
-	machines="sun sun4u"
-	ics="sparc stp22xx z8530 am7990 ieee754 ncr53c9x ncr89c105 mk48txx lsi64854 nec765 stp2024 ad184x"
-	buses="sbus"
-	fb_xlats="1152x900d1b1s0p32om 1152x900d8b8s0p32ommi8 1152x900d1b1s0p32omccmi8"
-	;;
-
-    *)
-	AC_MSG_ERROR([don't know how to emulate ${machine}])
-	;;
-    esac
-
-    # add in the new machines, ICs, serials, and buses to compile:
-    for machine in $machines; do
-	if echo " ${TME_MACHINE_SUBDIRS} " | grep " ${machine} " > /dev/null 2>&1; then :; else
-	    TME_MACHINE_SUBDIRS="${TME_MACHINE_SUBDIRS} ${machine}"
-	fi
-    done
-    for ic in $ics; do
-	if test -d $srcdir/ic/$ic; then
-	    if echo " ${TME_IC_SUBDIRS} " | grep " ${ic} " > /dev/null 2>&1; then :; else
-		TME_IC_SUBDIRS="${TME_IC_SUBDIRS} ${ic}"
-	    fi
-	else
-	    ic="tme_ic_${ic}.la"
-	    if echo " ${TME_ICS} " | grep " ${ic} " > /dev/null 2>&1; then :; else
-		TME_ICS="${TME_ICS} ${ic}"
-	    fi
-	fi
-    done
-    for serial in $serials; do
-	if test -d $srcdir/serial/$serial; then
-	    if echo " ${TME_SERIAL_SUBDIRS} " | grep " ${serial} " > /dev/null 2>&1; then :; else
-		TME_SERIAL_SUBDIRS="${TME_SERIAL_SUBDIRS} ${serial}"
-	    fi
-	else
-	    serial="tme_serial_${serial}.la"
-	    if echo " ${TME_SERIALS} " | grep " ${serial} " > /dev/null 2>&1; then :; else
-		TME_SERIALS="${TME_SERIALS} ${serial}"
-	    fi
-	fi
-    done
-    for bus in $buses; do
-	if echo " ${TME_BUS_SUBDIRS} " | grep " ${bus} " > /dev/null 2>&1; then :; else
-	    TME_BUS_SUBDIRS="${TME_BUS_SUBDIRS} ${bus}"
-	fi
-    done
-	
-    # add in the new frame buffer translations to compile:
-    for fb_xlat in $fb_xlats; do
- 	if echo " ${TME_FB_XLAT_SRC} " | grep " ${fb_xlat} " > /dev/null 2>&1; then :; else
-	    TME_FB_XLAT_SRC="${TME_FB_XLAT_SRC} ${fb_xlat}"
-	fi
-    done
-done
-AC_SUBST(TME_MACHINE_SUBDIRS)
-AC_SUBST(TME_IC_SUBDIRS)
-AC_SUBST(TME_ICS)
-AC_SUBST(TME_SERIAL_SUBDIRS)
-AC_SUBST(TME_SERIALS)
-AC_SUBST(TME_BUS_SUBDIRS)
+bus_size_max=64
+recode_size_guest_max=64
+
+TME_FB_XLAT_SRC="1152x900d1b1s0p32om 1152x900d8b8s0p32ommi8 1152x900d1b1s0p32omccmi8"
 AC_SUBST(TME_FB_XLAT_SRC)
 
 dnl Checks for X11.
@@ -1572,6 +1443,7 @@ bus_size_max="$bus_size_max"
 
 dnl Writes files.
 AC_CONFIG_FILES([Makefile
+	  tme-modules.sh
 	  tme/Makefile
 	  tme/ic/Makefile
 	  tme/machine/Makefile
@@ -1612,6 +1484,7 @@ AC_CONFIG_FILES([Makefile
           serial/Makefile
           scsi/Makefile
           generic/Makefile
+          generic/bus/Makefile
 	  tmesh/Makefile
 	  tools/Makefile])
 AC_OUTPUT

--- a/generic/Makefile.am
+++ b/generic/Makefile.am
@@ -53,9 +53,4 @@ fb-xlat-auto.c: %.c: %.sh
 	$(SHELL) $< src $(TME_FB_XLAT_SRC) dst $(TME_FB_XLAT_DST) > $@
 endif
 
-pkglib_LTLIBRARIES = tme_generic.la
-tme_generic_la_SOURCES = bus-el.c
-tme_generic_la_LDFLAGS = -module -version-info 0:0:0
-tme_generic_la_LIBADD = libtme-generic.la
-
-include $(top_srcdir)/modules
+SUBDIRS = . bus

--- /dev/null
+++ b/generic/bus/Makefile.am
@@ -0,0 +1,14 @@
+## Process this file with automake to produce Makefile.in
+# Makefile.am for The Machine Emulator generic/:
+
+AUTOMAKE_OPTIONS = 1.4 gnu
+
+AUTOM4TE = $(SHELL) $(top_srcdir)/missing --run autom4te
+
+AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) -I$(top_srcdir)/lib -I. -D_TME_IMPL -DLIBTME_GENERIC_BUILD
+
+pkglib_LTLIBRARIES = tme_generic.la
+tme_generic_la_SOURCES = bus-el.c
+tme_generic_la_LIBADD = $(TME_LIBS)
+
+include $(top_srcdir)/modules

--- a/host/Makefile.am
+++ b/host/Makefile.am
@@ -11,8 +11,7 @@ tme_host_posix_la_SOURCES = posix-memory.c \
 	posix-tape.c \
 	posix-serial.c
 
-tme_host_posix_la_LDFLAGS = -module -version-info 0:0:0
-tme_host_posix_la_LIBADD = $(top_builddir)/generic/libtme-generic.la
+tme_host_posix_la_LIBADD = $(TME_LIBS)
 
 include $(top_srcdir)/modules
 

--- a/host/display/Makefile.am
+++ b/host/display/Makefile.am
@@ -7,7 +7,7 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) -I$(top_srcdir)/lib -I. -D_TME_IMPL $(
 lib_LTLIBRARIES = libtme-display.la
 libtme_display_la_SOURCES = display-mouse.c display-keyboard.c display.c display.h
 libtme_display_la_LDFLAGS = -version-info 0:0:0
-libtme_display_la_LIBADD = $(top_builddir)/generic/libtme-generic.la $(GTK_LIBS)
+libtme_display_la_LIBADD = $(GTK_LIBS) $(TME_LIBS)
 
 EXTRA_DIST = keymap-make.pl keymap-def.h
 
@@ -23,5 +23,4 @@ endif
 
 include $(top_srcdir)/modules
 
-SUBDIRS = . @TME_DISPLAY_HOSTS@
-DIST_SUBDIRS = gtk rfb sdl
+DIST_SUBDIRS=gtk rfb sdl

--- a/host/display/gtk/Makefile.am
+++ b/host/display/gtk/Makefile.am
@@ -7,7 +7,6 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) -I$(top_srcdir)/lib -I$(srcdir)/.. -I.
 
 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_LDFLAGS = -module -version-info 0:0:0
-tme_host_gtk_la_LIBADD = ../libtme-display.la $(GTK_LIBS)
+tme_host_gtk_la_LIBADD = ../libtme-display.la $(GTK_LIBS) $(TME_LIBS)
 
 include $(top_srcdir)/modules

--- a/host/display/rfb/Makefile.am
+++ b/host/display/rfb/Makefile.am
@@ -7,7 +7,6 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) -I$(top_srcdir)/lib -I$(srcdir)/.. -I.
 
 pkglib_LTLIBRARIES = tme_host_rfb.la
 tme_host_rfb_la_SOURCES = rfb-display.c
-tme_host_rfb_la_LDFLAGS = -module -version-info 0:0:0
-tme_host_rfb_la_LIBADD = ../libtme-display.la $(RFB_LIBS)
+tme_host_rfb_la_LIBADD = ../libtme-display.la $(RFB_LIBS) $(TME_LIBS)
 
 include $(top_srcdir)/modules

--- a/host/display/sdl/Makefile.am
+++ b/host/display/sdl/Makefile.am
@@ -10,7 +10,6 @@ LDADD = ../libtme-display.la $(RFB_LIBS) $(SDL_LIBS)
 
 pkglib_LTLIBRARIES = tme_host_sdl.la
 tme_host_sdl_la_SOURCES = sdl-display.c
-tme_host_sdl_la_LDFLAGS = -module -version-info 0:0:0
-tme_host_sdl_la_LIBADD = ../libtme-display.la $(SDL_LIBS)
+tme_host_sdl_la_LIBADD = ../libtme-display.la $(SDL_LIBS) $(TME_LIBS)
 
 include $(top_srcdir)/modules

--- a/host/eth/Makefile.am
+++ b/host/eth/Makefile.am
@@ -7,9 +7,8 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) -I$(top_srcdir)/lib -I. -D_TME_IMPL
 lib_LTLIBRARIES = libtme-eth.la
 libtme_eth_la_SOURCES = eth-impl.c eth-if.h
 libtme_eth_la_LDFLAGS = -version-info 0:0:0
-libtme_eth_la_LIBADD = $(top_builddir)/generic/libtme-generic.la
+libtme_eth_la_LIBADD = $(TME_LIBS)
 
 include $(top_srcdir)/modules
 
-SUBDIRS = . @TME_ETH_HOSTS@
-DIST_SUBDIRS = bsd tun openvpn
+DIST_SUBDIRS=bsd openvpn tun

--- a/host/eth/bsd/Makefile.am
+++ b/host/eth/bsd/Makefile.am
@@ -7,7 +7,6 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) -I$(top_srcdir)/lib -I$(srcdir)/.. -I.
 
 pkglib_LTLIBRARIES = tme_host_bsd.la
 tme_host_bsd_la_SOURCES = bsd-bpf.c
-tme_host_bsd_la_LDFLAGS = -module -version-info 0:0:0
-tme_host_bsd_la_LIBADD = ../libtme-eth.la
+tme_host_bsd_la_LIBADD = ../libtme-eth.la $(TME_LIBS)
 
 include $(top_srcdir)/modules

--- a/host/eth/openvpn/Makefile.am
+++ b/host/eth/openvpn/Makefile.am
@@ -9,7 +9,10 @@ pkglib_LTLIBRARIES = tme_host_openvpn.la
 tme_host_openvpn_la_SOURCES = \
 	openvpn-link.c \
 	openvpn-tap.c
-tme_host_openvpn_la_LIBADD = ../libtme-eth.la
-tme_host_openvpn_la_LDFLAGS = -module -version-info 0:0:0
+tme_host_openvpn_la_LIBADD = ../libtme-eth.la $(TME_LIBS)
+
+if WIN32
+tme_host_openvpn_la_LIBADD += -lgdi32 -lws2_32 -lwininet -lcrypt32 -liphlpapi -lwinmm
+endif
 
 include $(top_srcdir)/modules

--- a/host/eth/tun/Makefile.am
+++ b/host/eth/tun/Makefile.am
@@ -7,7 +7,6 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir)/lib -I.
 
 pkglib_LTLIBRARIES = tme_host_tun.la
 tme_host_tun_la_SOURCES = tun-tap.c
-tme_host_tun_la_LDFLAGS = -module -version-info 0:0:0
-tme_host_tun_la_LIBADD = ../libtme-eth.la $(NATLIBS)
+tme_host_tun_la_LIBADD = ../libtme-eth.la $(NATLIBS) $(TME_LIBS)
 
 include $(top_srcdir)/modules

--- a/ic/Makefile.am
+++ b/ic/Makefile.am
@@ -5,11 +5,9 @@ AUTOMAKE_OPTIONS = 1.4 gnu
 
 AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) -I$(top_srcdir)/lib -I. -D_TME_IMPL
 
-SUBDIRS = @TME_IC_SUBDIRS@
-DIST_SUBDIRS = m68k ieee754 sparc stp22xx
+SUBDIRS = ieee754 m68k sparc stp22xx
 
-pkglib_LTLIBRARIES = @TME_ICS@
-EXTRA_LTLIBRARIES = tme_ic_am9513.la \
+pkglib_LTLIBRARIES = tme_ic_am9513.la \
 	tme_ic_z8530.la \
 	tme_ic_i825x6.la \
 	tme_ic_isil7170.la \
@@ -26,63 +24,48 @@ EXTRA_LTLIBRARIES = tme_ic_am9513.la \
 	tme_ic_mm58167.la
 
 tme_ic_am9513_la_SOURCES = am9513.c
-tme_ic_am9513_la_LDFLAGS = -rpath $(pkglibdir) -module -version-info 0:0:0
-tme_ic_am9513_la_LIBADD = $(top_builddir)/generic/libtme-generic.la 
+tme_ic_am9513_la_LIBADD = $(TME_LIBS)
 
 tme_ic_z8530_la_SOURCES = z8530.c z8530reg.h
-tme_ic_z8530_la_LDFLAGS = -rpath $(pkglibdir) -module -version-info 0:0:0
-tme_ic_z8530_la_LIBADD = $(top_builddir)/generic/libtme-generic.la
+tme_ic_z8530_la_LIBADD = $(TME_LIBS)
 
 tme_ic_mm58167_la_SOURCES = mm58167.c
-tme_ic_mm58167_la_LDFLAGS = -rpath $(pkglibdir) -module -version-info 0:0:0
-tme_ic_mm58167_la_LIBADD = $(top_builddir)/generic/libtme-generic.la
+tme_ic_mm58167_la_LIBADD = $(TME_LIBS)
 
 tme_ic_i825x6_la_SOURCES = i825x6.c i825x6reg.h
-tme_ic_i825x6_la_LDFLAGS = -rpath $(pkglibdir) -module -version-info 0:0:0
-tme_ic_i825x6_la_LIBADD = $(top_builddir)/generic/libtme-generic.la
+tme_ic_i825x6_la_LIBADD = $(TME_LIBS)
 
 tme_ic_isil7170_la_SOURCES = isil7170.c
-tme_ic_isil7170_la_LDFLAGS = -rpath $(pkglibdir) -module -version-info 0:0:0
-tme_ic_isil7170_la_LIBADD = $(top_builddir)/generic/libtme-generic.la
+tme_ic_isil7170_la_LIBADD = $(TME_LIBS)
 
 tme_ic_ncr5380_la_SOURCES = ncr5380.c
-tme_ic_ncr5380_la_LDFLAGS = -rpath $(pkglibdir) -module -version-info 0:0:0
-tme_ic_ncr5380_la_LIBADD = $(top_builddir)/generic/libtme-generic.la
+tme_ic_ncr5380_la_LIBADD = $(TME_LIBS)
 
 tme_ic_ncr53c9x_la_SOURCES = ncr53c9x.c
-tme_ic_ncr53c9x_la_LDFLAGS = -rpath $(pkglibdir) -module -version-info 0:0:0
-tme_ic_ncr53c9x_la_LIBADD = $(top_builddir)/generic/libtme-generic.la
+tme_ic_ncr53c9x_la_LIBADD = $(TME_LIBS)
 
 tme_ic_ncr89c105_la_SOURCES = ncr89c105.c
-tme_ic_ncr89c105_la_LDFLAGS = -rpath $(pkglibdir) -module -version-info 0:0:0
-tme_ic_ncr89c105_la_LIBADD = $(top_builddir)/generic/libtme-generic.la
+tme_ic_ncr89c105_la_LIBADD = $(TME_LIBS)
 
 tme_ic_stp2024_la_SOURCES = stp2024.c
-tme_ic_stp2024_la_LDFLAGS = -rpath $(pkglibdir) -module -version-info 0:0:0
-tme_ic_stp2024_la_LIBADD = $(top_builddir)/generic/libtme-generic.la
+tme_ic_stp2024_la_LIBADD = $(TME_LIBS)
 
 tme_ic_ad184x_la_SOURCES = ad184x.c
-tme_ic_ad184x_la_LDFLAGS = -rpath $(pkglibdir) -module -version-info 0:0:0
-tme_ic_ad184x_la_LIBADD = $(top_builddir)/generic/libtme-generic.la
+tme_ic_ad184x_la_LIBADD = $(TME_LIBS)
 
 tme_ic_mk48txx_la_SOURCES = mk48txx.c
-tme_ic_mk48txx_la_LDFLAGS = -rpath $(pkglibdir) -module -version-info 0:0:0
-tme_ic_mk48txx_la_LIBADD = $(top_builddir)/generic/libtme-generic.la
+tme_ic_mk48txx_la_LIBADD = $(TME_LIBS)
 
 tme_ic_nec765_la_SOURCES = nec765.c
-tme_ic_nec765_la_LDFLAGS = -rpath $(pkglibdir) -module -version-info 0:0:0
-tme_ic_nec765_la_LIBADD = $(top_builddir)/generic/libtme-generic.la
+tme_ic_nec765_la_LIBADD = $(TME_LIBS)
 
 tme_ic_am7930_la_SOURCES = am7930.c
-tme_ic_am7930_la_LDFLAGS = -rpath $(pkglibdir) -module -version-info 0:0:0
-tme_ic_am7930_la_LIBADD = $(top_builddir)/generic/libtme-generic.la
+tme_ic_am7930_la_LIBADD = $(TME_LIBS)
 
 tme_ic_am7990_la_SOURCES = am7990.c
-tme_ic_am7990_la_LDFLAGS = -rpath $(pkglibdir) -module -version-info 0:0:0
-tme_ic_am7990_la_LIBADD = $(top_builddir)/generic/libtme-generic.la
+tme_ic_am7990_la_LIBADD = $(TME_LIBS)
 
 tme_ic_lsi64854_la_SOURCES = lsi64854.c
-tme_ic_lsi64854_la_LDFLAGS = -rpath $(pkglibdir) -module -version-info 0:0:0
-tme_ic_lsi64854_la_LIBADD = $(top_builddir)/generic/libtme-generic.la
+tme_ic_lsi64854_la_LIBADD = $(TME_LIBS)
 
 include $(top_srcdir)/modules

--- a/ic/ieee754/Makefile.am
+++ b/ic/ieee754/Makefile.am
@@ -13,7 +13,7 @@ tmeicinclude_HEADERS = ieee754-auto.h ieee754-ops-auto.h
 lib_LTLIBRARIES = libtme-ieee754.la
 libtme_ieee754_la_SOURCES = ieee754-ops-auto.c ieee754-misc.c softfloat-tme.c
 libtme_ieee754_la_LDFLAGS = -lm -version-info 0:0:0
-libtme_ieee754_la_LIBADD = $(top_builddir)/generic/libtme-generic.la
+libtme_ieee754_la_LIBADD = $(TME_LIBS)
 
 AM_CFLAGS = @CFLAGS_NO_STRICT_ALIASING@
 
@@ -43,3 +43,4 @@ ieee754-ops-auto.h: ieee754-ops-auto.sh ieee754-precision.sh
 ieee754-ops-auto.c: ieee754-ops-auto.sh ieee754-precision.sh
 	$(SHELL) $< > $@
 
+include $(top_srcdir)/modules

--- a/ic/m68k/Makefile.am
+++ b/ic/m68k/Makefile.am
@@ -14,8 +14,7 @@ tme_ic_m68k_la_SOURCES = m68k-opmap.c \
 	m68010.c \
 	m68020.c \
 	m6888x.c
-tme_ic_m68k_la_LDFLAGS = -module -version-info 0:0:0
-tme_ic_m68k_la_LIBADD = ../ieee754/libtme-ieee754.la
+tme_ic_m68k_la_LIBADD = ../ieee754/libtme-ieee754.la $(TME_LIBS)
 
 noinst_SCRIPTS = m68k-misc-auto.sh \
 	m68k-insns-auto.sh \

--- a/ic/sparc/Makefile.am
+++ b/ic/sparc/Makefile.am
@@ -17,8 +17,7 @@ tme_ic_sparc_la_SOURCES = \
 	stp103x.c \
 	cy7c601.c \
 	mb86900.c
-tme_ic_sparc_la_LDFLAGS = -module -version-info 0:0:0
-tme_ic_sparc_la_LIBADD = ../ieee754/libtme-ieee754.la
+tme_ic_sparc_la_LIBADD = ../ieee754/libtme-ieee754.la $(TME_LIBS)
 noinst_SCRIPTS = sparc-misc-auto.sh \
 	sparc-insns-auto.sh \
 	sparc-fpu-auto.sh \

--- a/ic/stp22xx/Makefile.am
+++ b/ic/stp22xx/Makefile.am
@@ -16,8 +16,8 @@ tme_ic_stp22xx_la_SOURCES = \
   stp222x-iommu.c \
   stp222x-stc.c \
   stp22xx.c
-tme_ic_stp22xx_la_LDFLAGS = -rpath $(pkglibdir) -module -version-info 0:0:0
-tme_ic_stp22xx_la_LIBADD = $(top_builddir)/generic/libtme-generic.la
+tme_ic_stp22xx_la_LIBADD = $(TME_LIBS)
+
 EXTRA_DIST = stp222x-impl.h \
 	stp22xx-impl.h
 

--- a/libtme/Makefile.am
+++ b/libtme/Makefile.am
@@ -38,7 +38,7 @@ libtme_la_SOURCES += threads-sjlj.c
 endif
 libtme_la_LDFLAGS = -version-info 0:0:0
 libtme_la_LIBADD = $(LIBLTDL) $(LTLIBOBJS)
-if USING_OPENVPN
+if HAVE_OPENVPN
 libtme_la_LIBADD += $(top_builddir)/libopenvpn/libopenvpn.la
 endif
 if THREADS_GLIB

--- a/machine/Makefile.am
+++ b/machine/Makefile.am
@@ -3,6 +3,5 @@
 
 AUTOMAKE_OPTIONS = 1.4 gnu
 
-SUBDIRS = @TME_MACHINE_SUBDIRS@
-DIST_SUBDIRS = sun sun2 sun3 sun4 sun4u
+SUBDIRS = sun sun2 sun3 sun4 sun4u
 

--- a/machine/sun/Makefile.am
+++ b/machine/sun/Makefile.am
@@ -14,7 +14,7 @@ libtme_machine_sun_la_SOURCES = sun-mmu.c \
 	sun-si.c \
 	sun-obie.c
 libtme_machine_sun_la_LDFLAGS = -version-info 0:0:0
-libtme_machine_sun_la_LIBADD = $(top_builddir)/generic/libtme-generic.la
+libtme_machine_sun_la_LIBADD = $(TME_LIBS)
 
 bin_SCRIPTS = tme-sun-idprom tme-sun-eeprom
 
@@ -31,3 +31,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

--- a/machine/sun2/Makefile.am
+++ b/machine/sun2/Makefile.am
@@ -11,8 +11,8 @@ tme_machine_sun2_la_SOURCES =	\
 	sun2-mmu.c		\
 	sun2-control.c		\
 	sun2-impl.h
-tme_machine_sun2_la_LDFLAGS = -module -version-info 0:0:0
-tme_machine_sun2_la_LIBADD = ../sun/libtme-machine-sun.la
+
+tme_machine_sun2_la_LIBADD = ../sun/libtme-machine-sun.la $(TME_LIBS)
 
 examplesdir = $(pkgdatadir)/examples
 dist_examples_DATA = SUN2-MULTIBUS

--- a/machine/sun3/Makefile.am
+++ b/machine/sun3/Makefile.am
@@ -11,8 +11,8 @@ tme_machine_sun3_la_SOURCES =	\
 	sun3-mmu.c		\
 	sun3-control.c		\
 	sun3-impl.h
-tme_machine_sun3_la_LDFLAGS = -module -version-info 0:0:0
-tme_machine_sun3_la_LIBADD = ../sun/libtme-machine-sun.la
+
+tme_machine_sun3_la_LIBADD = ../sun/libtme-machine-sun.la $(TME_LIBS)
 
 examplesdir = $(pkgdatadir)/examples
 dist_examples_DATA = SUN3-CARRERA sun3-carrera-eeprom.txt

--- a/machine/sun4/Makefile.am
+++ b/machine/sun4/Makefile.am
@@ -15,8 +15,8 @@ tme_machine_sun4_la_SOURCES =	\
 	sun44c-control.c	\
 	sun44c-memerr.c		\
 	sun4-impl.h
-tme_machine_sun4_la_LDFLAGS = -module -version-info 0:0:0
-tme_machine_sun4_la_LIBADD = ../sun/libtme-machine-sun.la
+
+tme_machine_sun4_la_LIBADD = ../sun/libtme-machine-sun.la $(TME_LIBS)
 
 examplesdir = $(pkgdatadir)/examples
 dist_examples_DATA = SUN4-75

--- a/modules
+++ b/modules
@@ -54,16 +54,6 @@
 # this directory was originally just for include files and to make
 # #include <tme/FOO.h> work right when building:
 modules-local:
-	@echo updating tme modules list..
-	@grep TME_ELEMENT_NEW_DECL $(srcdir)/*.c |		\
-	sed -e 's%.*TME_ELEMENT_NEW_DECL(\(.*\)).*%\1%'		\
-	>> $(top_srcdir)/tme/tme-plugins.txt
-	@grep TME_ELEMENT_SUB_NEW_DECL $(srcdir)/*.c |		\
-	sed -e 's%.*TME_ELEMENT_SUB_NEW_DECL(\(.*\),\(.*\)).*%\1_\2 \1 \2%' \
-	>> $(top_srcdir)/tme/tme-plugins.txt
-	@grep TME_ELEMENT_X_NEW_DECL $(srcdir)/*.c |		\
-	sed -e 's%.*TME_ELEMENT_X_NEW_DECL(\(.*\),\(.*\),\(.*\)).*%\1\3 \1\2 \3%' \
-	>> $(top_srcdir)/tme/tme-plugins.txt
 
 #
 # next, when building statically, either for debugging purposes or
@@ -85,14 +75,8 @@ modules-local:
 # @TME_PREOPEN@ is then used on the program's link command line.
 # 
 # Note: this works differently now - please see comment in top Makefile for modules target
-	@if test "x$(pkglib_LTLIBRARIES)" != x; then		\
-	    for module in $(pkglib_LTLIBRARIES); do		\
-		echo $$module ;					\
-		echo " \\" >> $(top_srcdir)/tme-preopen.txt ; \
-		echo -ne "\t-dlopen ../$(subdir)/$$module" >> $(top_srcdir)/tme-preopen.txt ; \
-	    done ;						\
-	fi
-
+	$(top_builddir)/tme-modules.sh $(subdir) $(top_srcdir) $(pkglib_LTLIBRARIES)
+	
 # additionally, libtool, at least through version 1.5, has a
 # limitation in that the pseudo-library (the .la file) must be present
 # even for a preloaded module.  if we aren't debugging, everything is
@@ -106,3 +90,5 @@ 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:
+AM_LDFLAGS = -module -version-info 0:0:0
+TME_LIBS = $(top_builddir)/generic/libtme-generic.la $(top_builddir)/libtme/libtme.la

--- a/scsi/Makefile.am
+++ b/scsi/Makefile.am
@@ -23,7 +23,6 @@ tme_scsi_la_SOURCES = \
 	scsi-msg.c \
 	scsi-device.c \
 	scsi-bus.c
-tme_scsi_la_LDFLAGS = -rpath $(pkglibdir) -module -version-info 0:0:0
-tme_scsi_la_LIBADD = $(top_builddir)/generic/libtme-generic.la 
+tme_scsi_la_LIBADD = $(TME_LIBS)
 
 include $(top_srcdir)/modules

--- a/serial/Makefile.am
+++ b/serial/Makefile.am
@@ -18,7 +18,6 @@ tme_serial_kb_la_SOURCES = \
 	serial-ms.h \
 	serial-ms.c \
 	ms-mssystems.c
-tme_serial_kb_la_LDFLAGS = -rpath $(pkglibdir) -module -version-info 0:0:0
-tme_serial_kb_la_LIBADD = $(top_builddir)/generic/libtme-generic.la 
+tme_serial_kb_la_LIBADD = $(TME_LIBS)
 
 include $(top_srcdir)/modules

--- /dev/null
+++ b/tme-hosts.txt
@@ -0,0 +1,6 @@
+tme_host_gtk=../host/display/gtk
+tme_host_rfb=../host/display/rfb
+tme_host_sdl=../host/display/sdl
+tme_host_tun=../host/eth/tun
+tme_host_bsd=../host/eth/bsd
+tme_host_openvpn=../host/eth/openvpn

--- /dev/null
+++ b/tme-modules.sh.in
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+subdir=$1
+topdir=$2
+srcdir=$2/$1
+
+if test -e .modules; then exit; fi
+touch .modules
+
+echo updating tme modules list..
+grep TME_ELEMENT_NEW_DECL $srcdir/*.c |	
+    sed -e 's%.*TME_ELEMENT_NEW_DECL(\(.*\)).*%\1%' >> $topdir/tme/tme-plugins.txt
+grep TME_ELEMENT_SUB_NEW_DECL $srcdir/*.c |		
+    sed -e 's%.*TME_ELEMENT_SUB_NEW_DECL(\(.*\),\(.*\)).*%\1_\2 \1 \2%' >> $topdir/tme/tme-plugins.txt
+grep TME_ELEMENT_X_NEW_DECL $srcdir/*.c |		
+    sed -e 's%.*TME_ELEMENT_X_NEW_DECL(\(.*\),\(.*\),\(.*\)).*%\1\3 \1\2 \3%' >> $topdir/tme/tme-plugins.txt
+
+for num; do
+    if test $num = $1; then continue; fi
+    host=
+    for tme_host in @TME_HOST_TYPES@; do
+	if test $num = $2; then
+	    if test -d $tme_host; then 
+		cd $tme_host && make modules
+		cd -
+	    fi
+	else
+	    if test $num = "tme_host_${tme_host}.la"; then
+	    	echo "tme_host_${tme_host}=../${subdir}" >> $topdir/tme-hosts.txt 
+		host=yes
+		break
+	    fi
+	fi
+    done
+    if test $num = $2; then continue; fi
+    if test "x${host}" = x; then
+	echo -n "-dlopen ../${subdir}/$num " >> $topdir/tme-preopen.txt 
+    fi 
+done

--- a/tme-preopen.txt
+++ b/tme-preopen.txt
@@ -1,34 +1 @@
-LDADD = \
-	-dlopen ../generic/tme_generic.la \
-	-dlopen ../ic/m68k/tme_ic_m68k.la \
-	-dlopen ../ic/sparc/tme_ic_sparc.la \
-	-dlopen ../ic/stp22xx/tme_ic_stp22xx.la \
-	-dlopen ../ic/tme_ic_am9513.la \
-	-dlopen ../ic/tme_ic_mm58167.la \
-	-dlopen ../ic/tme_ic_z8530.la \
-	-dlopen ../ic/tme_ic_i825x6.la \
-	-dlopen ../ic/tme_ic_isil7170.la \
-	-dlopen ../ic/tme_ic_ncr5380.la \
-	-dlopen ../ic/tme_ic_am7930.la \
-	-dlopen ../ic/tme_ic_am7990.la \
-	-dlopen ../ic/tme_ic_ncr53c9x.la \
-	-dlopen ../ic/tme_ic_mk48txx.la \
-	-dlopen ../ic/tme_ic_lsi64854.la \
-	-dlopen ../ic/tme_ic_nec765.la \
-	-dlopen ../ic/tme_ic_ncr89c105.la \
-	-dlopen ../ic/tme_ic_stp2024.la \
-	-dlopen ../ic/tme_ic_ad184x.la \
-	-dlopen ../machine/sun2/tme_machine_sun2.la \
-	-dlopen ../machine/sun3/tme_machine_sun3.la \
-	-dlopen ../machine/sun4/tme_machine_sun4.la \
-	-dlopen ../host/display/rfb/tme_host_rfb.la \
-	-dlopen ../host/display/sdl/tme_host_sdl.la \
-	-dlopen ../host/display/gtk/tme_host_gtk.la \
-	-dlopen ../host/eth/bsd/tme_host_bsd.la \
-	-dlopen ../host/eth/tun/tme_host_tun.la \
-	-dlopen ../host/eth/openvpn/tme_host_openvpn.la \
-	-dlopen ../host/tme_host_posix.la \
-	-dlopen ../bus/multibus/tme_bus_multibus.la \
-	-dlopen ../bus/sbus/tme_bus_sbus.la \
-	-dlopen ../serial/tme_serial_kb.la \
-	-dlopen ../scsi/tme_scsi.la
\ No newline at end of file
+tme_preopen=-dlopen ../generic/bus/tme_generic.la -dlopen ../ic/m68k/tme_ic_m68k.la -dlopen ../ic/sparc/tme_ic_sparc.la -dlopen ../ic/stp22xx/tme_ic_stp22xx.la -dlopen ../ic/tme_ic_am9513.la -dlopen ../ic/tme_ic_z8530.la -dlopen ../ic/tme_ic_i825x6.la -dlopen ../ic/tme_ic_isil7170.la -dlopen ../ic/tme_ic_ncr5380.la -dlopen ../ic/tme_ic_ncr53c9x.la -dlopen ../ic/tme_ic_ncr89c105.la -dlopen ../ic/tme_ic_stp2024.la -dlopen ../ic/tme_ic_ad184x.la -dlopen ../ic/tme_ic_mk48txx.la -dlopen ../ic/tme_ic_nec765.la -dlopen ../ic/tme_ic_am7930.la -dlopen ../ic/tme_ic_am7990.la -dlopen ../ic/tme_ic_lsi64854.la -dlopen ../ic/tme_ic_mm58167.la -dlopen ../machine/sun2/tme_machine_sun2.la -dlopen ../machine/sun3/tme_machine_sun3.la -dlopen ../machine/sun4/tme_machine_sun4.la -dlopen ../host/tme_host_posix.la -dlopen ../bus/multibus/tme_bus_multibus.la -dlopen ../bus/sbus/tme_bus_sbus.la -dlopen ../serial/tme_serial_kb.la -dlopen ../scsi/tme_scsi.la 
\ No newline at end of file

--- a/tme/tme-plugins.txt
+++ b/tme/tme-plugins.txt
@@ -42,11 +42,18 @@ tme_machine_sun4_fdc tme_machine_sun4 fdc
 tme_machine_sun4_oclock tme_machine_sun4 oclock
 tme_machine_sun4_clock tme_machine_sun4 clock
 tme_machine_sun4_zs tme_machine_sun4 zs
+tme_host_gtk_display tme_host_gtk display
+tme_host_gtk_display tme_host_gtk display
+tme_host_rfb_display tme_host_rfb display
 tme_host_rfb_display tme_host_rfb display
 tme_host_sdl_display tme_host_sdl display
-tme_host_gtk_display tme_host_gtk display
-tme_host_bsd_bpf tme_host_bsd bpf
+tme_host_sdl_display tme_host_sdl display
 tme_host_tun_tap tme_host_tun tap
+tme_host_tun_tap tme_host_tun tap
+tme_host_bsd_bpf tme_host_bsd bpf
+tme_host_bsd_bpf tme_host_bsd bpf
+tme_host_openvpn_tun_tap tme_host_openvpn tun_tap
+tme_host_openvpn_socket_link tme_host_openvpn socket_link
 tme_host_openvpn_socket_link tme_host_openvpn socket_link
 tme_host_openvpn_socket_server tme_host_openvpn_socket server
 tme_host_openvpn_tun_tap tme_host_openvpn tun_tap

--- a/tmesh/Makefile.am
+++ b/tmesh/Makefile.am
@@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = 1.4 gnu
 
 AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) -I$(top_srcdir)/lib -I. -D_TME_IMPL
 
-if USING_OPENVPN
+if HAVE_OPENVPN
 AM_CPPFLAGS += -DTME_OPENVPN
 endif
 
@@ -19,9 +19,13 @@ libtmesh_la_SOURCES = \
 libtmesh_la_LIBADD = $(top_builddir)/libtme/libtme.la
 
 bin_PROGRAMS = tmesh
-tmesh_LDADD = libtmesh.la $(LDADD)
+tmesh_LDADD = libtmesh.la $(tme_preopen) @TME_HOSTS@
 tmesh_LDFLAGS = -dlpreopen force -dlopen self
-include $(top_srcdir)/tme-preopen.txt
 
 install-exec-hook:
 	$(SETCAP) $(DESTDIR)$(bindir)/$(TGTPFX)tmesh$(EXEEXT)
+
+include $(top_srcdir)/tme-hosts.txt
+include $(top_srcdir)/tme-preopen.txt
+
+SUBDIRS = @TME_HOSTS_DIRS@