X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=Makefile;h=b337e519217150078747f0a1dc7bf466264c490f;hp=1acde7a84dc036d11debdeab22ac46235bfdfe0d;hb=b2a665f8f1cdeb7d02c3f665d95e6a80297e21d1;hpb=026b04fc75011a144285f399b82890803b4315bd

diff --git a/Makefile b/Makefile
index 1acde7a..b337e51 100644
--- a/Makefile
+++ b/Makefile
@@ -47,8 +47,8 @@ endif
 ifdef WITH-CRYPTO
 LIBDIR += -L/usr/local/ssl/lib
 CFLAGS += -I/usr/local/ssl/include
-#LIBS += -lcrypto
-LIBS += /usr/local/ssl/lib/libcrypto.a
+LIBS += -lcrypto
+#LIBS += /usr/local/ssl/lib/libcrypto.a
 endif
 
 #all:
@@ -64,7 +64,6 @@ all: $(CHAN_LCR) $(LCR) $(LCRADMIN) $(GEN) $(GENW) $(GENRC) $(GENEXT)
 	@sh -c 'grep -n sprintf *.c* --exclude chan_lcr.c --exclude bchannel.c --exclude callerid.c ; if test $$''? = 0 ; then echo "dont use sprintf, use makro instead." ; exit -1 ; fi'
 	@sh -c 'grep -n snprintf *.c* --exclude chan_lcr.c --exclude bchannel.c --exclude callerid.c ; if test $$''? = 0 ; then echo "dont use snprintf, use makro instead." ; exit -1 ; fi'
 	@echo "All LCR binaries done"
-	@sync
 	@exit
 
 main.o: main.c *.h Makefile
@@ -74,7 +73,9 @@ message.o: message.c *.h Makefile
 	$(PP) -c $(CFLAGS) message.c -o message.o
 
 options.o: options.c *.h Makefile
-	$(PP) -c $(CFLAGS) options.c -o options.o
+	$(CC) -c $(CFLAGS) options.c -o options.o
+options.ooo: options.c *.h Makefile
+	$(PP) -c $(CFLAGS) options.c -o options.ooo
 
 interface.o: interface.c *.h Makefile
 	$(PP) -c $(CFLAGS) interface.c -o interface.o
@@ -168,7 +169,7 @@ bchannel.o: bchannel.c *.h Makefile
 #	-o $(WIZZARD) 
 
 $(LCR): main.o \
-	options.o \
+	options.ooo \
 	interface.o \
 	extension.o \
 	cause.o \
@@ -195,8 +196,8 @@ $(LCR): main.o \
 	socket_server.o \
 	trace.o
 	$(PP) $(LIBDIR) \
-       	main.o \
-	options.o \
+	main.o \
+	options.ooo \
 	interface.o \
 	extension.o \
 	cause.o \
@@ -224,12 +225,13 @@ $(LCR): main.o \
 	trace.o \
 	$(LIBS) -o $(LCR) 
 
-$(LCRADMIN): lcradmin.c cause.c *.h Makefile
+$(LCRADMIN): lcradmin.c cause.c options.c *.h Makefile
 	$(PP) $(LIBDIR) $(CFLAGS_LCRADMIN) $(CURSES) -lm lcradmin.c cause.c \
-	-o $(LCRADMIN) 
+	options.c -o $(LCRADMIN) 
 
-$(CHAN_LCR): chan_lcr.o bchannel.o callerid.o *.h Makefile
-	$(CC) -shared -Xlinker -x $(LDFLAGS) -o $(CHAN_LCR) chan_lcr.o bchannel.o callerid.o
+$(CHAN_LCR): chan_lcr.o bchannel.o callerid.o options.o *.h Makefile
+	$(CC) -shared -fPIC -Xlinker -x $(LDFLAGS) -o $(CHAN_LCR) chan_lcr.o \
+       	bchannel.o callerid.o options.o
 
 
 $(LCRWATCH): watch.c *.h Makefile
@@ -248,8 +250,8 @@ $(GENRC): genrc.c *.h Makefile
 	$(PP) $(LIBDIR) $(CFLAGS) -lm genrc.c \
 	-o $(GENRC) 
 
-$(GENEXT): options.o extension.o genext.o
-	$(PP) $(CFLAGS) options.o extension.o genext.o -o $(GENEXT) 
+$(GENEXT): options.ooo extension.o genext.o
+	$(PP) $(CFLAGS) options.ooo extension.o genext.o -o $(GENEXT) 
 
 #install:
 #	@echo Remember, this is a beta release. To overwrite your current installed
@@ -257,7 +259,7 @@ $(GENEXT): options.o extension.o genext.o
 #	@exit
 
 install:
-	-killall -9 -w -q lcr # the following error must be ignored
+	make
 	cp $(LCR) $(INSTALL_BIN)
 	cp $(LCRADMIN) $(INSTALL_BIN)
 ifdef WITH-ASTERISK
@@ -301,12 +303,11 @@ endif
 	@if test -a $(INSTALL_DATA)/tones_efi ; then \
 		echo "NOTE: special efi tones already exists, not overwritten." ; else \
 		cp -a tones_efi $(INSTALL_DATA) ; fi
-	sync
 
 clean:
 	touch *
 	rm -f $(LCR) $(LCRADMIN) $(CHAN_LCR) $(LCRWATCH) $(GEN) $(GENW) $(GENRC) $(GENEXT)
-	rm -f *.o
+	rm -f *.o *.ooo
 	rm -f .*.c.sw* .*.cpp.sw* .*.h.sw*
 	rm -f bla nohup.out a.out
 	rm -f debug*.log
@@ -316,18 +317,9 @@ tar:
 	cd .. &&  tar --exclude=.git -cvzf lcr_`date +%Y%m%d`.tar.gz lcr
 
 start: $(LCR)
-	sync
-	-killall -9 -w -q lcr # the following error must be ignored
-	$(LCR) start
-
-s: $(LCR)
-	sync
-	-killall -9 -w -q lcr # the following error must be ignored
 	$(LCR) start
 
 fork: $(LCR)
-	sync
-	-killall -9 -w -q lcr # the following error must be ignored
 	$(LCR) fork
 
 snapshot: clean