updates.

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

diff --git a/lib/silcsim/Makefile.am b/lib/silcsim/Makefile.am
index 4921e624d29beb47e17c1d0897079edd37d0e117..799c85918375403bafd2c26c514b5b15ea42c423 100644 (file)
--- a/lib/silcsim/Makefile.am
+++ b/lib/silcsim/Makefile.am
@@ -28,8 +28,6 @@ libsilcsim_a_SOURCES = \
        silcsim.c \
        silcsimutil.c
 
-SIM_CFLAGS = -fPIC -shared
-
 SIM_MODULES_DIR = modules
 
 SUBDIRS = modules
@@ -45,7 +43,8 @@ SIM_CIPHER_OBJS = \
         mars.o \
         aes.o \
         rsa.o \
-        twofish.o
+        twofish.o \
+       cast.o
 
 #
 # SILC Hash Functions to be compiled as modules
@@ -59,22 +58,21 @@ all: $(SIM_CIPHER_OBJS) $(SIM_HASH_OBJS)
 endif
 
 $(SIM_CIPHER_OBJS): ../silccrypt/libsilccrypt.a
-       rm -rf $*.c $*.o
-       $(LN_S) $(srcdir)/../silccrypt/$*.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)/$(SIM_MODULES_DIR) && $(LN_S) $(srcdir)/../.libs/lib$*.so $(srcdir)/$*.sim.so
 
 $(SIM_HASH_OBJS): ../silccrypt/libsilccrypt.a
-       rm -rf $*.c $*.o
-       $(LN_S) $(srcdir)/../silccrypt/$*.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)/$(SIM_MODULES_DIR) && $(LN_S) $(srcdir)/../.libs/lib$*.so $(srcdir)/$*.sim.so
 
-CLEANFILES = $(SIM_MODULES_DIR)/*.sim.so
+CLEANFILES = $(SIM_MODULES_DIR)/*.sim.so *.la
 
-EXTRA_DIST = *.h
+if SILC_DIST_TOOLKIT
+include_HEADERS = silcsim.h silcsimutil.h
+endif
 
-include $(top_srcdir)/Makefile.defines
+EXTRA_DIST = *.h
 
+include $(top_srcdir)/Makefile.defines.in