Create separate Makefiles

Create separate makefiles for dump1090, view1090 and ppup1090. These can
be run with the command line "make -f makedump1090", "make -f
makeview1019" and "make -f makeppup1090"

Pass dump1090 version number into ppup1090 uploader so that coaa1090.obj
doesn't need re-compiling between versions.

Remove ppup1090 from general Makefile - it's not intended for anything
other than RPi, so gives linker errors on other (non Linux raspian)
systems.

Makefile

@@ -15,7 +15,7 @@ LIBS=`pkg-config --libs librtlsdr` -lpthread -lm
 CC=gcc
 
 
-all: dump1090 view1090 ppup1090
+all: dump1090 view1090
 
 %.o: %.c
 	$(CC) $(CFLAGS) $(EXTRACFLAGS) -c $<
@@ -26,8 +26,5 @@ dump1090: dump1090.o anet.o interactive.o mode_ac.o mode_s.o net_io.o
 view1090: view1090.o anet.o interactive.o mode_ac.o mode_s.o net_io.o
 	$(CC) -g -o view1090 view1090.o anet.o interactive.o mode_ac.o mode_s.o net_io.o $(LIBS)
 
-ppup1090: ppup1090.o anet.o interactive.o mode_ac.o mode_s.o net_io.o
-	$(CC) -g -o ppup1090 ppup1090.o anet.o interactive.o mode_ac.o mode_s.o net_io.o coaa1090.obj $(LIBS)
-
 clean:
-	rm -f *.o dump1090 view1090 ppup1090
+	rm -f *.o dump1090 view1090

dump1090.h

@@ -37,7 +37,7 @@
 // MinorVer changes when additional features are added, but not for bug fixes (range 00-99)
 // DayDate & Year changes for all changes, including for bug fixes. It represent the release date of the update
 //
-#define MODES_DUMP1090_VERSION     "1.07.0410.13"
+#define MODES_DUMP1090_VERSION     "1.07.0610.13"
 
 // ============================= Include files ==========================
 

makedump1090

@@ -0,0 +1,27 @@
+#
+# When building a package or installing otherwise in the system, make
+# sure that the variable PREFIX is defined, e.g. make PREFIX=/usr/local
+#
+PROGNAME=dump1090
+
+ifdef PREFIX
+BINDIR=$(PREFIX)/bin
+SHAREDIR=$(PREFIX)/share/$(PROGNAME)
+EXTRACFLAGS=-DHTMLPATH=\"$(SHAREDIR)\"
+endif
+
+CFLAGS=-O2 -g -Wall -W `pkg-config --cflags librtlsdr`
+LIBS=`pkg-config --libs librtlsdr` -lpthread -lm
+CC=gcc
+
+
+all: dump1090
+
+%.o: %.c
+	$(CC) $(CFLAGS) $(EXTRACFLAGS) -c $<
+
+dump1090: dump1090.o anet.o interactive.o mode_ac.o mode_s.o net_io.o
+	$(CC) -g -o dump1090 dump1090.o anet.o interactive.o mode_ac.o mode_s.o net_io.o $(LIBS)
+
+clean:
+	rm -f *.o dump1090

makeppup1090

@@ -0,0 +1,27 @@
+#
+# When building a package or installing otherwise in the system, make
+# sure that the variable PREFIX is defined, e.g. make PREFIX=/usr/local
+#
+PROGNAME=ppup1090
+
+ifdef PREFIX
+BINDIR=$(PREFIX)/bin
+SHAREDIR=$(PREFIX)/share/$(PROGNAME)
+EXTRACFLAGS=-DHTMLPATH=\"$(SHAREDIR)\"
+endif
+
+CFLAGS=-O2 -g -Wall -W `pkg-config --cflags librtlsdr`
+LIBS=`pkg-config --libs librtlsdr` -lpthread -lm
+CC=gcc
+
+
+all: ppup1090
+
+%.o: %.c
+	$(CC) $(CFLAGS) $(EXTRACFLAGS) -c $<
+
+ppup1090: ppup1090.o anet.o interactive.o mode_ac.o mode_s.o net_io.o
+	$(CC) -g -o ppup1090 ppup1090.o anet.o interactive.o mode_ac.o mode_s.o net_io.o coaa1090.obj $(LIBS)
+
+clean:
+	rm -f *.o ppup1090

makeview1090

@@ -0,0 +1,27 @@
+#
+# When building a package or installing otherwise in the system, make
+# sure that the variable PREFIX is defined, e.g. make PREFIX=/usr/local
+#
+PROGNAME=view1090
+
+ifdef PREFIX
+BINDIR=$(PREFIX)/bin
+SHAREDIR=$(PREFIX)/share/$(PROGNAME)
+EXTRACFLAGS=-DHTMLPATH=\"$(SHAREDIR)\"
+endif
+
+CFLAGS=-O2 -g -Wall -W `pkg-config --cflags librtlsdr`
+LIBS=`pkg-config --libs librtlsdr` -lpthread -lm
+CC=gcc
+
+
+all: view1090
+
+%.o: %.c
+	$(CC) $(CFLAGS) $(EXTRACFLAGS) -c $<
+
+view1090: view1090.o anet.o interactive.o mode_ac.o mode_s.o net_io.o
+	$(CC) -g -o view1090 view1090.o anet.o interactive.o mode_ac.o mode_s.o net_io.o $(LIBS)
+
+clean:
+	rm -f *.o view1090

ppup1090.c

@@ -108,6 +108,7 @@ void ppup1090Init(void) {
     coaa1090.fUserLon = MODES_USER_LONGITUDE_DFLT;
     strcpy(coaa1090.strAuthCode,STR(USER_AUTHCODE));
     strcpy(coaa1090.strRegNo,   STR(USER_REGNO));
+    strcpy(coaa1090.strVersion, MODES_DUMP1090_VERSION);
 
     if ((iErr = initCOAA (coaa1090)))
     {
@@ -121,7 +122,7 @@ void ppup1090Init(void) {
 void showHelp(void) {
     printf(
 "-----------------------------------------------------------------------------\n"
-"|                        ppup1090 dump1090 Uploader      Ver : "MODES_DUMP1090_VERSION " |\n"
+"|    ppup1090 RPi Uploader for COAA Planeplotter         Ver : "MODES_DUMP1090_VERSION " |\n"
 "-----------------------------------------------------------------------------\n"
   "--net-bo-ipaddr <IPv4>   TCP Beast output listen IPv4 (default: 127.0.0.1)\n"
   "--net-bo-port <port>     TCP Beast output listen port (default: 30005)\n"

ppup1090.h

@@ -81,6 +81,7 @@ struct _coaa1090 {
     double fUserLon;
     char   strAuthCode[16];
     char   strRegNo[16];
+    char   strVersion[16];
 }  coaa1090;
 
 // ======================== function declarations =========================