Merged from silc_1_0_branch.

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

diff --git a/lib/Makefile.am.pre b/lib/Makefile.am.pre
index c4777f513c851367323df1edb7b74322b237013c..fc4c150571f6aabed45d78ed14466cf66a0f1a69 100644 (file)
--- 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,6 +69,22 @@ 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
@@ -85,11 +99,34 @@ silcclient.dll: libsilcclient.a
        -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)