modified: chan_lcr.c

[lcr.git] / Makefile

diff --git a/Makefile b/Makefile
index fd73542..1c9cca3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,11 @@ WITH-CRYPTO = 42 # comment this out, if no libcrypto should be used
 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,6 +33,7 @@ PP = g++
 WIZZARD = ./wizzard
 LCR = ./lcr
 LCRADMIN = ./lcradmin
+CFLAGS_LCRADMIN = -DINSTALL_DATA=\"$(INSTALL_DATA)\"
 ifdef WITH-ASTERISK
 CHAN_LCR = ./chan_lcr
 endif
@@ -37,13 +42,13 @@ 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
@@ -146,8 +151,8 @@ 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
@@ -187,7 +192,7 @@ $(LCR): main.o \
        join.o \
        joinpbx.o \
        joinremote.o \
-       admin_server.o \
+       socket_server.o \
        trace.o
        $(PP) $(LIBDIR) \
                main.o \
@@ -214,12 +219,12 @@ $(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