updates.

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

diff --git a/lib/silcsim/Makefile.am b/lib/silcsim/Makefile.am
index ad45d5be586e64f9c65301fb661fbf8f130fd866..866c941c0368efad92a604213d29ba5db15b4124 100644 (file)
--- a/lib/silcsim/Makefile.am
+++ b/lib/silcsim/Makefile.am
@@ -28,12 +28,6 @@ libsilcsim_a_SOURCES = \
        silcsim.c \
        silcsimutil.c
 
-SIM_CFLAGS = -fPIC -shared
-
-SIM_MODULES_DIR = modules
-
-SUBDIRS = modules
-
 #
 # SILC Ciphers to be compiled as modules
 #
@@ -60,22 +54,20 @@ all: $(SIM_CIPHER_OBJS) $(SIM_HASH_OBJS)
 endif
 
 $(SIM_CIPHER_OBJS): ../silccrypt/libsilccrypt.a
-       rm -rf $*.c $*.o
-       $(LN_S) $(srcdir)/../silccrypt/$*.c $*.c
-       $(COMPILE) $(SIM_CFLAGS) $*.c -o $(SIM_MODULES_DIR)/$*.sim.so
-       $(LN_S) $(srcdir)/$(SIM_MODULES_DIR)/$*.sim.so $*.o
-       rm -rf $*.c
+       $(LTCOMPILE) -c $(srcdir)/../silccrypt/$*.c
+       $(LIBTOOL) --mode=link $(LINK) -rpath $(silc_modulesdir) -o lib$*.la $*.lo
+       cd $(srcdir) && $(LN_S) -f $(srcdir)/../.libs/lib$*.so $(srcdir)/$*.sim.so
 
 $(SIM_HASH_OBJS): ../silccrypt/libsilccrypt.a
-       rm -rf $*.c $*.o
-       $(LN_S) $(srcdir)/../silccrypt/$*.c $*.c
-       $(COMPILE) $(SIM_CFLAGS) $*.c -o $(SIM_MODULES_DIR)/$*.sim.so
-       $(LN_S) $(srcdir)/$(SIM_MODULES_DIR)/$*.sim.so $*.o
-       rm -rf $*.c
+       $(LTCOMPILE) -c $(srcdir)/../silccrypt/$*.c
+       $(LIBTOOL) --mode=link $(LINK) -rpath $(silc_modulesdir) -o lib$*.la $*.lo
+       cd $(srcdir) && $(LN_S) -f $(srcdir)/../.libs/lib$*.so $(srcdir)/$*.sim.so
 
-CLEANFILES = $(SIM_MODULES_DIR)/*.sim.so
+CLEANFILES = *.sim.so *.la
 
+if SILC_DIST_TOOLKIT
 include_HEADERS = silcsim.h silcsimutil.h
+endif
 
 EXTRA_DIST = *.h