Updates to comly with new source tree.

[silc.git] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index e67620e39d58e018296d9cc6e292a75c60edd695..dd537292c10feac7edd8fb95a4edb740f84c84d1 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -24,14 +24,39 @@ SUBDIRS = \
        silccrypt \
        silcsim \
        silcmath \
-       silcske
+       silcske \
+       silcutil \
+       silcclient
 #        zlib
 
-CLEANFILES = libsilc.a
-DISTCLEANFILES = libsilc.a
+# SILC Library dirs
+SILCLIB_DIRS = \
+       contrib \
+       silccore \
+       silccrypt \
+       silcsim \
+       silcmath \
+       silcske \
+       silcutil
 
-all:  libsilc.a
+# SILC Client Library dirs
+SILCCLIENTLIB_DIRS = \
+       silcclient
+
+CLEANFILES = libsilc.a libsilcclient.a
+DISTCLEANFILES = libsilc.a libsilcclient.a
+
+all:  remove libsilc.a libsilcclient.a
+
+remove:
+       -rm -rf libsilc.a
+       -rm -rf libsilcclient.a
 
 libsilc.a:
-       find . -type f -name *.o | xargs $(AR) cru libsilc.a
+       find $(SILCLIB_DIRS) -type f -name *.o | xargs $(AR) cru libsilc.a
        ranlib libsilc.a
+
+libsilcclient.a:
+       find $(SILCCLIENTLIB_DIRS) -type f -name *.o | xargs $(AR) cru libsilcclient.a
+       ranlib libsilcclient.a
+