X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=Makefile;h=5c43a9ab1a97f8aaf26587b0cd3de207a604c74a;hp=fd735422b550e09802da8f73152efcf77aa878b3;hb=44b6b77e68c2b685174c09da4467139e009130b4;hpb=1e8009963503f713ab8b3866090b340a70f5aa77

diff --git a/Makefile b/Makefile
index fd73542..5c43a9a 100644
--- a/Makefile
+++ b/Makefile
@@ -11,14 +11,18 @@
 
 WITH-CRYPTO = 42 # comment this out, if no libcrypto should be used
 #WITH-ASTERISK = 42 # comment this out, if you don't require built-in Asterisk channel driver.
-#WITH-SOCKET = 42 # compile for socket based mISDN (this options is far unfinished !!!)
+WITH-SOCKET = 42 # compile for socket based mISDN (this options is far unfinished !!!)
 # note: check your location and the names of libraries.
 
 # select location to install
 INSTALL_BIN = /usr/local/bin
 INSTALL_DATA = /usr/local/lcr
 
+ifdef WITH-SOCKET
+LIBS += -lmisdn -lpthread
+else
 LIBS += -lisdnnet -lmISDN -lpthread
+endif
 CHANLIBS += -lmISDN
 
 # give location of the curses or ncurses library
@@ -29,21 +33,22 @@ PP = g++
 WIZZARD = ./wizzard
 LCR = ./lcr
 LCRADMIN = ./lcradmin
+CFLAGS_LCRADMIN = -DINSTALL_DATA=\"$(INSTALL_DATA)\"
 ifdef WITH-ASTERISK
-CHAN_LCR = ./chan_lcr
+CHAN_LCR = ./chan_lcr.so
 endif
 LCRWATCH = ./lcrwatch
 GEN = ./gentones
 GENW = ./genwave
 GENRC = ./genrc
 GENEXT = ./genextension
-CFLAGS = -DINSTALL_DATA=\"$(INSTALL_DATA)\" -I/usr/include/mISDNuser/
+CFLAGS = -Wall -g -DINSTALL_DATA=\"$(INSTALL_DATA)\"
 #CFLAGS = -Wall -g -DINSTALL_DATA=\"$(INSTALL_DATA)\"
 ifdef WITH-CRYPTO
 CFLAGS += -DCRYPTO
 endif
 ifdef WITH-SOCKET
-CFLAGS += -DSOCKET_MISDN
+CFLAGS += -DSOCKET_MISDN -I/usr/include/mISDNuser
 endif
 ifdef WITH-CRYPTO
 LIBDIR += -L/usr/local/ssl/lib
@@ -122,6 +127,9 @@ endpointapp.o: endpointapp.cpp *.h Makefile
 apppbx.o: apppbx.cpp *.h Makefile
 	$(PP) -c $(CFLAGS) apppbx.cpp -o apppbx.o
 
+callerid.o: callerid.c *.h Makefile
+	$(PP) -c $(CFLAGS) callerid.c -o callerid.o
+
 join.o: join.cpp *.h Makefile
 	$(PP) -c $(CFLAGS) join.cpp -o join.o
 
@@ -146,17 +154,17 @@ crypt.o: crypt.cpp *.h Makefile
 genext.o: genext.c *.h Makefile
 	$(PP) -c $(CFLAGS) genext.c -o genext.o
 
-admin_server.o: admin_server.c *.h Makefile
-	$(PP) -c $(CFLAGS) admin_server.c -o admin_server.o
+socket_server.o: socket_server.c *.h Makefile
+	$(PP) -c $(CFLAGS) socket_server.c -o socket_server.o
 
 trace.o: trace.c *.h Makefile
 	$(PP) -c $(CFLAGS) trace.c -o trace.o
 
 chan_lcr.o: chan_lcr.c *.h Makefile
-	$(CC) -c $(CFLAGS) chan_lcr.c -o chan_lcr.o
+	$(CC) -D_GNU_SOURCE -c $(CFLAGS) chan_lcr.c -o chan_lcr.o
 
 bchannel.o: bchannel.c *.h Makefile
-	$(CC) -c $(CFLAGS) bchannel.c -o bchannel.o
+	$(CC) -D_GNU_SOURCE -c $(CFLAGS) bchannel.c -o bchannel.o
 
 
 #$(WIZZARD): wizzard.c Makefile
@@ -179,6 +187,7 @@ $(LCR): main.o \
 	endpoint.o \
 	endpointapp.o \
 	apppbx.o \
+	callerid.o \
 	crypt.o \
 	action.o \
 	action_vbox.o \
@@ -187,7 +196,7 @@ $(LCR): main.o \
 	join.o \
 	joinpbx.o \
 	joinremote.o \
-	admin_server.o \
+	socket_server.o \
 	trace.o
 	$(PP) $(LIBDIR) \
        	main.o \
@@ -206,6 +215,7 @@ $(LCR): main.o \
 	endpoint.o \
 	endpointapp.o \
 	apppbx.o \
+	callerid.o \
 	crypt.o \
 	action.o \
 	action_vbox.o \
@@ -214,17 +224,17 @@ $(LCR): main.o \
 	join.o \
 	joinpbx.o \
 	joinremote.o \
-	admin_server.o \
+	socket_server.o \
 	trace.o \
 	$(LIBS) -o $(LCR) 
 
-$(LCRADMIN): admin_client.c cause.c *.h Makefile
-	$(PP) $(LIBDIR) $(CFLAGS) $(CURSES) -lm admin_client.c cause.c \
+$(LCRADMIN): lcradmin.c cause.c *.h Makefile
+	$(PP) $(LIBDIR) $(CFLAGS_LCRADMIN) $(CURSES) -lm lcradmin.c cause.c \
 	-o $(LCRADMIN) 
 
-$(CHAN_LCR): chan_lcr.o bchannel.o
-	$(CC) $(LIBDIR) chan_lcr.o bchannel.o \
-	$(CHANLIBS) -o $(CHAN_LCR) 
+$(CHAN_LCR): chan_lcr.o bchannel.o *.h Makefile
+	gcc -shared -Xlinker -x $(LDFLAGS) -o $(CHAN_LCR) chan_lcr.o bchannel.o
+
 
 $(LCRWATCH): watch.c *.h Makefile
 	$(PP) $(LIBDIR) $(CFLAGS) -lm watch.c \
@@ -254,9 +264,9 @@ install:
 	-killall -9 -w -q lcr # the following error must be ignored
 	cp $(LCR) $(INSTALL_BIN)
 	cp $(LCRADMIN) $(INSTALL_BIN)
-ifdef WITH_ASTERISK
-	cp $(CHAN_LCR) $(INSTALL_BIN)
-endif
+#ifdef WITH-ASTERISK
+#	cp $(CHAN_LCR) $(INSTALL_CHAN)
+#endif
 #	cp $(LCRWATCH) $(INSTALL_BIN)
 	cp $(GEN) $(INSTALL_BIN)
 	cp $(GENW) $(INSTALL_BIN)