X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=lib%2Fsilcsim%2FMakefile.am;h=3e45d3d7521ff8b513100b8bd6570ad39613957b;hp=ad45d5be586e64f9c65301fb661fbf8f130fd866;hb=382d15d447b7a95390decfa783836ae4fe255b3d;hpb=ee9ad49e68cd69759ca643579c2f0de0747c4f61

diff --git a/lib/silcsim/Makefile.am b/lib/silcsim/Makefile.am
index ad45d5be..3e45d3d7 100644
--- a/lib/silcsim/Makefile.am
+++ b/lib/silcsim/Makefile.am
@@ -19,21 +19,15 @@
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
 if SILC_SIM
-noinst_LIBRARIES = libsilcsim.a
+noinst_LTLIBRARIES = libsilcsim.la
 else
-noinst_LIBRARIES = 
+noinst_LTLIBRARIES = 
 endif
 
-libsilcsim_a_SOURCES = \
+libsilcsim_la_SOURCES = \
 	silcsim.c \
 	silcsimutil.c
 
-SIM_CFLAGS = -fPIC -shared
-
-SIM_MODULES_DIR = modules
-
-SUBDIRS = modules
-
 #
 # SILC Ciphers to be compiled as modules
 #
@@ -42,7 +36,6 @@ SIM_CIPHER_OBJS = \
         blowfish.o \
         rc5.o \
         rc6.o \
-        mars.o \
         aes.o \
         rsa.o \
         twofish.o \
@@ -59,23 +52,33 @@ if SILC_SIM
 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
+if SILC_LIBTOOLFIX
+LTFLAGS = --libtool-enable-shared
+else
+LTFLAGS =
+endif
+
+$(SIM_CIPHER_OBJS):
+	@if test '!' -f lib$*.la ; then \
+	  $(LIBTOOL) --mode=link $(CCLD) -rpath $(silc_modulesdir) \
+		../silccrypt/$*.lo -o lib$*.la $(LTFLAGS); \
+	  cd $(srcdir) && $(LN_S) -f $(srcdir)/.libs/lib$*.so \
+		$(srcdir)/$*.sim.so; \
+	fi
 
-$(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
+$(SIM_HASH_OBJS):
+	@if test '!' -f lib$*.la ; then \
+	  $(LIBTOOL) --mode=link $(CCLD) -rpath $(silc_modulesdir) \
+		../silccrypt/$*.lo -o lib$*.la $(LTFLAGS); \
+	  cd $(srcdir) && $(LN_S) -f $(srcdir)/.libs/lib$*.so \
+		$(srcdir)/$*.sim.so; \
+	fi
 
-CLEANFILES = $(SIM_MODULES_DIR)/*.sim.so
+CLEANFILES = *.sim.so *.la
 
+if SILC_DIST_TOOLKIT
 include_HEADERS = silcsim.h silcsimutil.h
+endif
 
 EXTRA_DIST = *.h