X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=lib%2FMakefile.am.pre;h=fc4c150571f6aabed45d78ed14466cf66a0f1a69;hp=0b553b69a08c7e9f48c6308905e0d548d8f67db4;hb=382d15d447b7a95390decfa783836ae4fe255b3d;hpb=6377b643cced54190fcfa09f0fb5ac1c1279b770

diff --git a/lib/Makefile.am.pre b/lib/Makefile.am.pre
index 0b553b69..fc4c1505 100644
--- a/lib/Makefile.am.pre
+++ b/lib/Makefile.am.pre
@@ -27,9 +27,8 @@ COMMONDIRS = \
 	silcske \
 	silcutil \
 	silcclient \
-	dotconf \
-	trq
-#        zlib
+	silcsftp
+#	zlib
 
 SUBDIRS = SILC_DISTRIBUTION_SUBDIRS
 DIST_SUBDIRS = SILC_DISTRIBUTION_SUBDIRS
@@ -43,8 +42,7 @@ SILCLIB_DIRS = \
 	silcmath \
 	silcske \
 	silcutil \
-	trq \
-	dotconf
+	silcsftp
 
 # SILC Client Library dirs
 SILCCLIENTLIB_DIRS = \
@@ -71,24 +69,64 @@ remove:
 	-rm -rf libsilc.a
 	-rm -rf libsilcclient.a
 
+if SILC_DIST_TOOLKIT
+install-exec-hook:
+	-mkdir -p $(DESTDIR)$(libdir)
+	-$(LIBTOOL) $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/
+	-$(LIBTOOL) $(INSTALL) libsilcclient.la $(DESTDIR)$(libdir)/
+else
+install-exec-hook:
+	-mkdir -p $(libdir)
+	-$(LIBTOOL) $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/
+	-rm -rf $(DESTDIR)$(libdir)/libsilc.a
+if SILC_DIST_CLIENT
+	-$(LIBTOOL) $(INSTALL) libsilcclient.la $(DESTDIR)$(libdir)/
+	-rm -rf $(DESTDIR)$(libdir)/libsilcclient.a
+endif
+endif
+
 if SILC_DIST_WIN32DLL
 # WIN32 DLL generation
 silc.dll: libsilc.a
-	dllwrap --export-all --output-def silc.def \
-	--implib libsilc.a --driver-name $(CC) --target i386-mingw32 \
-	--mno-cygwin -o silc.dll libsilc.a -lwsock32
+	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 \
-	--implib libsilcclient.a --driver-name $(CC) --target i386-mingw32 \
-	--mno-cygwin -o silcclient.dll libsilcclient.a
+	--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
 
+LIB_BASE_VERSION=@LIB_BASE_VERSION@
+LIBSILC_CURRENT=@LIBSILC_CURRENT@
+LIBSILC_REVISION=@LIBSILC_REVISION@
+LIBSILC_AGE=@LIBSILC_AGE@
+LIBSILCCLIENT_CURRENT=@LIBSILCCLIENT_CURRENT@
+LIBSILCCLIENT_REVISION=@LIBSILCCLIENT_REVISION@
+LIBSILCCLIENT_AGE=@LIBSILCCLIENT_AGE@
+
 libsilc.a:
-	find $(SILCLIB_DIRS) -type f -name *.o | xargs $(AR) cru libsilc.a
-	ranlib libsilc.a
+	find $(SILCLIB_DIRS) -type f -name *.lo | xargs \
+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) \
+	-version-info $(LIBSILC_CURRENT):$(LIBSILC_REVISION):$(LIBSILC_AGE) \
+	-release $(LIB_BASE_VERSION) -rpath $(DESTDIR)$(libdir) -o libsilc.la
 
 libsilcclient.a:
-	find $(SILCCLIENTLIB_DIRS) -type f -name *.o | xargs $(AR) cru libsilcclient.a
-	ranlib libsilcclient.a
+	find $(SILCCLIENTLIB_DIRS) -type f -name *.lo | xargs \
+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) \
+	-version-info $(LIBSILCCLIENT_CURRENT):$(LIBSILCCLIENT_REVISION):$(LIBSILCCLIENT_AGE) \
+	-release $(LIB_BASE_VERSION) -rpath $(DESTDIR)$(libdir) -o libsilcclient.la
+
+if SILC_DIST_TOOLKIT
+SILC_EXTRA_DIST = doc
+else
+if SILC_DIST_SERVER
+SILC_EXTRA_DIST = 
+else
+SILC_EXTRA_DIST =
+endif
+endif
 
+EXTRA_DIST = $(SILC_EXTRA_DIST)