updates

[silc.git] / lib / Makefile.am.pre

diff --git a/lib/Makefile.am.pre b/lib/Makefile.am.pre
index 107912a835c0ba1afa5cfee1af480e19e15f3a07..6a256dbcfc61a363d0d4187b6baf514a123d8824 100644 (file)
--- a/lib/Makefile.am.pre
+++ b/lib/Makefile.am.pre
@@ -26,16 +26,11 @@ COMMONDIRS = \
        silcmath \
        silcske \
        silcutil \
-       dotconf \
-       trq
-#        zlib
-
-if SILC_DIST_CLIENT
-SUBDIRS = $(COMMONDIRS) silcclient
-else
-SUBDIRS = $(COMMONDIRS)
-endif
+       silcclient \
+       silcsftp
+#      zlib
 
+SUBDIRS = SILC_DISTRIBUTION_SUBDIRS
 DIST_SUBDIRS = SILC_DISTRIBUTION_SUBDIRS
 
 # SILC Library dirs
@@ -47,8 +42,7 @@ SILCLIB_DIRS = \
        silcmath \
        silcske \
        silcutil \
-       trq \
-       dotconf
+       silcsftp
 
 # SILC Client Library dirs
 SILCCLIENTLIB_DIRS = \
@@ -57,17 +51,43 @@ SILCCLIENTLIB_DIRS = \
 CLEANFILES = libsilc.a libsilcclient.a
 DISTCLEANFILES = libsilc.a libsilcclient.a
 
+if SILC_DIST_CLIENT
+all:  remove libsilc.a libsilcclient.a
+else
+if SILC_DIST_TOOLKIT
 all:  remove libsilc.a libsilcclient.a
+else
+if SILC_DIST_WIN32DLL
+all:  silc.dll silcclient.dll
+else
+all:  remove libsilc.a
+endif
+endif
+endif
 
 remove:
        -rm -rf libsilc.a
        -rm -rf libsilcclient.a
 
+if SILC_DIST_WIN32DLL
+# WIN32 DLL generation
+silc.dll: libsilc.a
+       dllwrap --export-all --output-def silc.def --output-exp silc.exp \
+       --output-lib silc.lib --driver-name $(CC) --target i386-mingw32 \
+       -mno-cygwin -o silc.dll libsilc.a -lwsock32
+
+silcclient.dll: libsilcclient.a
+       dllwrap --export-all --output-def silcclient.def \
+       --output-lib silcclient.lib --output-exp silcclient.exp \
+       --driver-name $(CC) --target i386-mingw32 \
+       -mno-cygwin -o silcclient.dll libsilcclient.a -L. -lsilc -lwsock32
+endif
+
 libsilc.a:
        find $(SILCLIB_DIRS) -type f -name *.o | xargs $(AR) cru libsilc.a
-       ranlib libsilc.a
+       $(RANLIB) libsilc.a
 
 libsilcclient.a:
        find $(SILCCLIENTLIB_DIRS) -type f -name *.o | xargs $(AR) cru libsilcclient.a
-       ranlib libsilcclient.a
+       $(RANLIB) libsilcclient.a