From f3b5167a0ade683a7db39da4c3a8f1ffe284d4db Mon Sep 17 00:00:00 2001 From: Malcolm Robb Date: Mon, 7 Oct 2013 10:59:10 +0100 Subject: [PATCH] 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 | 7 ++----- Release/view1090.exe | Bin 90112 -> 90112 bytes coaa1090.obj | Bin 18024 -> 18164 bytes dump1090.h | 2 +- makedump1090 | 27 +++++++++++++++++++++++++++ makeppup1090 | 27 +++++++++++++++++++++++++++ makeview1090 | 27 +++++++++++++++++++++++++++ ppup1090.c | 3 ++- ppup1090.h | 1 + 9 files changed, 87 insertions(+), 7 deletions(-) create mode 100644 makedump1090 create mode 100644 makeppup1090 create mode 100644 makeview1090 diff --git a/Makefile b/Makefile index f8309e7..1827026 100644 --- a/Makefile +++ b/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 diff --git a/Release/view1090.exe b/Release/view1090.exe index 9732dc21633a932ed668f2f494b709b24a2c090c..6f012803b7b928aea955e746e303e0c6e7cdfeb0 100644 GIT binary patch delta 5836 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 R!`n^VFX4Dm5qWFm{{nB?@2&s< diff --git a/coaa1090.obj b/coaa1090.obj index f62c363cfafe0a2f068ec2ba43ecba02f98dcb6a..d7db49386570d8a9f48be4bdca8d39c6adb069ca 100644 GIT binary patch delta 7286 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 ZOU9(hJ3RYgO_W4<&>%t@t;A0d|9_UJ_DTQ% diff --git a/dump1090.h b/dump1090.h index 44465e8..e23f9b5 100644 --- a/dump1090.h +++ b/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 ========================== diff --git a/makedump1090 b/makedump1090 new file mode 100644 index 0000000..51a7756 --- /dev/null +++ b/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 diff --git a/makeppup1090 b/makeppup1090 new file mode 100644 index 0000000..ece4450 --- /dev/null +++ b/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 diff --git a/makeview1090 b/makeview1090 new file mode 100644 index 0000000..67b25a8 --- /dev/null +++ b/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 diff --git a/ppup1090.c b/ppup1090.c index f71091c..1c36dd5 100644 --- a/ppup1090.c +++ b/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 TCP Beast output listen IPv4 (default: 127.0.0.1)\n" "--net-bo-port TCP Beast output listen port (default: 30005)\n" diff --git a/ppup1090.h b/ppup1090.h index 21fa998..8a6806d 100644 --- a/ppup1090.h +++ b/ppup1090.h @@ -81,6 +81,7 @@ struct _coaa1090 { double fUserLon; char strAuthCode[16]; char strRegNo[16]; + char strVersion[16]; } coaa1090; // ======================== function declarations =========================