Fix up the src dir Makefile so that we can build a sensible package.
Author: Colin Tuckley colint@debian.org

--- a/src/Makefile
+++ b/src/Makefile
@@ -1,10 +1,9 @@
 # this is only if "old" ax25 for kernel 2.0.x are used
-AX25OLDPATH = /usr/src/ax25
+#AX25OLDPATH = /usr/src/ax25
 
 # the rest should not be changed
-AX25LIBPATH = /usr/local/lib
-#AX25INCPATH = /usr/src/linux/include/netax25
-AX25INCPATH = /usr/local/include/netax25
+AX25LIBPATH = /usr/lib
+AX25INCPATH = /usr/include/netax25
 
 .EXPORT_ALL_VARIABLES:
 
@@ -20,9 +19,9 @@
 endif
 
 CC     = gcc
-CFLAGS = -g -O2 -Wstrict-prototypes -funsigned-char $(DEFS) -D__LINUX__ -DPROTOTYPES -I../include -fstack-check
-#CFLAGS = -Wall -Wstrict-prototypes -ggdb2 -funsigned-char $(DEFS) -D__LINUX__ -Wformat-security -D_FORTIFY_SOURCE=2 -DPROTOTYPES -I../include -fstack-check -fstack-protector-all
-LIBS   = -L$(AX25LIBPATH) -lm -lax25
+CFLAGS += -Wall -Wstrict-prototypes -O2 -g -funsigned-char $(DEFS) -D__LINUX__ -DPROTOTYPES -I../include
+#LIBS   = -L$(AX25LIBPATH) -lm -lax25
+LIBS   = -lm -lax25
 
 COMMON_OBJECTS = \
    arbre.o\
@@ -116,54 +115,43 @@
    xmodem.o\
    yapp.o
 
-all : xfbbd fbbgetconf epurmess epurwp reqdir clr_user maintinf xfbbC satupdat ajoursat satdoc
+all : xfbbd fbbgetconf epurmess epurwp reqdir clr_user maintinf xfbbC
 
 install: all
 	@cd ..;./install_sh
 
 clean :
 	$(RM) *.o *.orig ../include/*.orig core
-	$(RM) xfbbd xfbbC epurmess epurwp reqdir clr_user maintinf fbbgetconf
-	$(RM) satdoc satupdat ajoursat
-	$(RM) X11/*.o X11/xfbb X11/*.orig X11/core X11/xfbbX_cl
+	$(RM) xfbbd xfbbC epurmess epurwp reqdir clr_user maintinf
 
 xfbbd: $(COMMON_OBJECTS) xfbbd.o fbb_orb.o
-	$(CC) $(CFLAGS) -o xfbbd xfbbd.o fbb_orb.o $(COMMON_OBJECTS) $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o xfbbd xfbbd.o fbb_orb.o $(COMMON_OBJECTS) $(LIBS)
 
 xfbbd.o : xfbbd.c
 	$(CC) $(CFLAGS) -D__ORB__ -c -o xfbbd.o xfbbd.c
 
 fbbgetconf : fbbgetconf.o fbb_conf.o
-	$(CC) $(CFLAGS) -o fbbgetconf fbbgetconf.o fbb_conf.o
+	$(CC) $(CFLAGS) $(LDFLAGS) -o fbbgetconf fbbgetconf.o fbb_conf.o
 
 epurmess : epurmess.o fbb_conf.o
-	$(CC) $(CFLAGS) -o epurmess epurmess.o fbb_conf.o
+	$(CC) $(CFLAGS) $(LDFLAGS) -o epurmess epurmess.o fbb_conf.o
 
 epurwp : epurwp.o fbb_conf.o
-	$(CC) $(CFLAGS) -o epurwp epurwp.o fbb_conf.o
-
-clr_user : clr_user.o fbb_conf.o
-	$(CC) $(CFLAGS) -o clr_user clr_user.o fbb_conf.o
+	$(CC) $(CFLAGS) $(LDFLAGS) -o epurwp epurwp.o fbb_conf.o
 
 maintinf : maintinf.o fbb_conf.o
-	$(CC) $(CFLAGS) -o maintinf maintinf.o fbb_conf.o
+	$(CC) $(CFLAGS) $(LDFLAGS) -o maintinf maintinf.o fbb_conf.o
 
 reqdir : reqdir.o fbb_conf.o
-	$(CC) $(CFLAGS) -o reqdir reqdir.o fbb_conf.o
-
-satupdat : satupdat.c
-	$(CC) $(CFLAGS) satupdat.c -o satupdat
+	$(CC) $(CFLAGS) $(LDFLAGS) -o reqdir reqdir.o fbb_conf.o
 
-ajoursat : ajoursat.c
-	$(CC) $(CFLAGS) ajoursat.c -o ajoursat
-
-satdoc : satdoc.c
-	$(CC) $(CFLAGS) -o satdoc satdoc.c
+clr_user : clr_user.o fbb_conf.o
+	$(CC) $(CFLAGS) $(LDFLAGS) -o clr_user clr_user.o fbb_conf.o
 
 ifeq ($(USE_NCURSES),1)
 CFLAGS += -DUSE_NCURSES
 xfbbC : xfbbC.o md5c.o terminal.o
-	$(CC) $(CFLAGS) -o xfbbC xfbbC.o md5c.o terminal.o -lncurses
+	$(CC) $(CFLAGS) $(LDFLAGS) -o xfbbC xfbbC.o md5c.o terminal.o -lncurses
 else
 xfbbC : xfbbC.o md5c.o
 	@echo "***"
