Latest revisions

debian/patches/makefile

@@ -9,7 +9,7 @@
   pngread.o pngwrite.o png.o pngerror.o pngget.o pngmem.o APRSIconData.o AISCommon.o\
   upnp.o APRSStdPages.o HSMODEM.o WinRPR.o KISSHF.o TNCEmulators.o bpqhdlc.o SerialPort.o\
   adif.o WebMail.o utf8Routines.o VARA.o LzFind.o Alloc.o LzmaDec.o LzmaEnc.o LzmaLib.o \
-@@ -18,26 +18,41 @@
+@@ -18,26 +18,34 @@
  # Configuration:
  
  CC = gcc
@@ -21,17 +21,16 @@
 +CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
 +CFLAGS+=$(shell dpkg-buildflags --get CPPFLAGS)
 +CFLAGS+=-DLINBPQ
-+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
++LDFLAGS:=
 +
 +$(warning CFLAGS are $(CFLAGS))
++$(warning LDLAGS are $(LDFLAGS))
 +
 +LIBS = -lrt -lm -lz -lpthread -lconfig -lpcap -lpaho-mqtt3a -ljansson -lminiupnpc 
  
++all: linbpq
  
 -nomqtt: CFLAGS = -DLINBPQ -MMD -fcommon -g -DNOMQTT
-+
-+all: linbpq
-+
 +nomqtt: CFLAGS += -DNOMQTT
  nomqtt: linbpq
  
@@ -39,24 +38,19 @@
 +noi2c: CFLAGS += -DNOI2C
  noi2c: linbpq
  
-+COMPLETE_OBJS = 	$(COMPLETE_SRC:.c=o)
- 
+-
 -linbpq: $(OBJS)
 -	gcc $(OBJS) -Xlinker -Map=output.map -l:libminiupnpc.a -lrt -lm -lz $(LDFLAGS) -lpthread -lconfig -lpcap -o linbpq
 -	sudo setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" linbpq		
-+.c.o:
-+	$(CC) $(CFLAGS) $(LDFLAGS) -c $<
++linbpq: $(COMPLETE_SRC)
++	$(GCC) $(COMPLETE_SRC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o linbpq 
  
---include *.d
+ -include *.d
  
 -clean :
 -	rm *.d
 -	rm linbpq $(OBJS)
-+linbpq: $(COMPLETE_OBJS)
-+	$(LD) $(LDFLAGS) -o linbpq $(COMPLETE_OBJS) $(LIBS)
-+
-+-include *.d
- 
+-
 +install:
 +	install -b -m 755  -D -d		debian/linbpq/usr/sbin
 +	install -b -m 755  -p linbpq		debian/linbpq/usr/sbin