clean up makefile

diff --git a/Makefile b/Makefile
index a0cc34f..dcfcaea 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,8 +9,8 @@
 #*                                                                           **
 #*****************************************************************************/ 
 
-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-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 (
 # note: check your location and the names of libraries.
 
@@ -18,12 +18,6 @@ WITH-ASTERISK = 42 # comment this out, if you don't require built-in Asterisk ch
 INSTALL_BIN = /usr/local/bin
 INSTALL_DATA = /usr/local/lcr
 
-# give locations for the libraries
-LINUX_INCLUDE = -I/usr/src/linux/include
-
-# give location of the mISDN libraries
-MISDNUSER_INCLUDE = -I../mISDNuser/include -I../mISDNuser/i4lnet
-MISDNUSER_LIB = -L../mISDNuser/lib -L../mISDNuser/i4lnet
 LIBS += -lisdnnet -lmISDN -lpthread
 
 # give location of the curses or ncurses library
@@ -43,14 +37,12 @@ GENW = ./genwave
 GENRC = ./genrc
 GENEXT = ./genextension
 CFLAGS = -Wall -g -DINSTALL_DATA=\"$(INSTALL_DATA)\"
-CFLAGS += $(LINUX_INCLUDE) $(MISDNUSER_INCLUDE)
 ifdef WITH-CRYPTO
 CFLAGS += -DCRYPTO
 endif
 ifdef WITH-SOCKET
 CFLAGS += -DSOCKET_MISDN
 endif
-LIBDIR += $(MISDNUSER_LIB)
 ifdef WITH-CRYPTO
 LIBDIR += -L/usr/local/ssl/lib
 CFLAGS += -I/usr/local/ssl/include
@@ -313,5 +305,11 @@ fork: $(LCR)
        -killall -9 -w -q lcr # the following error must be ignored
        $(LCR) fork
 
+snapshot: clean
+       DIR=lcr-$$(date +"20%y_%m_%d") ; \
+       mkdir -p /tmp/$$DIR ; \
+       cp -a * /tmp/$$DIR ; \
+       cd /tmp/; \
+       tar czf $$DIR.tar.gz $$DIR
 
 

diff --git a/dss1.cpp b/dss1.cpp
index 4a3f3a6..0134ed4 100644 (file)
--- a/dss1.cpp
+++ b/dss1.cpp
@@ -22,7 +22,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 extern "C" {
-#include <net_l2.h>
+#include <mISDNuser/net_l2.h>
 }
 
 //#define CENTREX

diff --git a/mISDN.cpp b/mISDN.cpp
index 2507209..4b4e3fc 100644 (file)
--- a/mISDN.cpp
+++ b/mISDN.cpp
@@ -28,7 +28,7 @@
 #include <mlayer3.h>
 #else
 extern "C" {
-#include <net_l2.h>
+#include <mISDNuser/net_l2.h>
 }
 #endif
 
@@ -1265,7 +1265,7 @@ void message_bchannel_from_join(class JoinRemote *joinremote, int type, unsigned
 #ifdef SOCKET_MISDN
                                if (mISDNport->b_socket[i] == handle)
 #else
-                               if ((mISDNport->portnum<<8)+i+1+(i>=15) == handle)
+                               if ((unsigned long)(mISDNport->portnum<<8)+i+1+(i>=15) == handle)
 #endif
                                        break;
                                i++;

diff --git a/main.h b/main.h
index 954c6cb..f2cc3ff 100644 (file)
--- a/main.h
+++ b/main.h
@@ -115,8 +115,8 @@ void debug(const char *function, int line, char *prefix, char *buffer);
 extern "C" {
 #endif
 #ifndef SOCKET_MISDN
-#include <isdn_net.h>
-#include <../i4lnet/net_l3.h>
+#include <mISDNuser/isdn_net.h>
+#include <mISDNuser/net_l3.h>
 #endif
 #ifdef __cplusplus
 }