updates.

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

diff --git a/lib/Makefile.am.pre b/lib/Makefile.am.pre
index 1978d221d0ef478089b3a73a46a15898d1c16ac6..83a39e0315f182bf54de0998f2e4f9fa1e859ca6 100644 (file)
--- a/lib/Makefile.am.pre
+++ b/lib/Makefile.am.pre
@@ -18,7 +18,7 @@
 
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
-SUBDIRS = \
+COMMONDIRS = \
        contrib \
        silccore \
        silccrypt \
@@ -27,9 +27,12 @@ SUBDIRS = \
        silcske \
        silcutil \
        silcclient \
-       trq \
-       dotconf
+       silcsftp \
+       dotconf \
+       trq
 #        zlib
+
+SUBDIRS = SILC_DISTRIBUTION_SUBDIRS
 DIST_SUBDIRS = SILC_DISTRIBUTION_SUBDIRS
 
 # SILC Library dirs
@@ -41,6 +44,7 @@ SILCLIB_DIRS = \
        silcmath \
        silcske \
        silcutil \
+       silcsftp \
        trq \
        dotconf
 
@@ -51,17 +55,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