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

diff --git a/lib/silcsim/Makefile.am b/lib/silcsim/Makefile.am
index 3d761a4d..3e45d3d7 100644
--- a/lib/silcsim/Makefile.am
+++ b/lib/silcsim/Makefile.am
@@ -18,18 +18,16 @@
 
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
-noinst_LIBRARIES = libsilcsim.a
+if SILC_SIM
+noinst_LTLIBRARIES = libsilcsim.la
+else
+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
 #
@@ -38,10 +36,10 @@ SIM_CIPHER_OBJS = \
         blowfish.o \
         rc5.o \
         rc6.o \
-        mars.o \
-        rijndael.o \
+        aes.o \
         rsa.o \
-        twofish.o
+        twofish.o \
+	cast.o
 
 #
 # SILC Hash Functions to be compiled as modules
@@ -50,26 +48,38 @@ SIM_HASH_OBJS = \
 	md5.o \
 	sha1.o
 
+if SILC_SIM
 all: $(SIM_CIPHER_OBJS) $(SIM_HASH_OBJS)
+endif
+
+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_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
+$(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
 
-$(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
+CLEANFILES = *.sim.so *.la
 
-CLEANFILES = $(SIM_MODULES_DIR)/*.sim.so
+if SILC_DIST_TOOLKIT
+include_HEADERS = silcsim.h silcsimutil.h
+endif
 
 EXTRA_DIST = *.h
 
-INCLUDES = -I. -I.. -I../silccrypt -I../silcmath -I../silcske \
-	-I../silccore -I../.. -I../silcutil -I../../includes \
-	-I../silcmath/gmp -I../trq
+include $(top_srcdir)/Makefile.defines.in