[hamradio-commits] [dump1090] 267/389: Create separate Makefiles
Matthew Ernisse
mernisse-guest at moszumanska.debian.org
Wed Nov 5 00:20:03 UTC 2014
This is an automated email from the git hooks/post-receive script.
mernisse-guest pushed a commit to branch master
in repository dump1090.
commit f3b5167a0ade683a7db39da4c3a8f1ffe284d4db
Author: Malcolm Robb <Support at ATTAvionics.com>
Date: Mon Oct 7 10:59:10 2013 +0100
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 +-
Makefile => makedump1090 | 10 ++--------
Makefile => makeppup1090 | 12 +++---------
Makefile => makeview1090 | 12 +++---------
ppup1090.c | 3 ++-
ppup1090.h | 1 +
9 files changed, 14 insertions(+), 33 deletions(-)
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 9732dc2..6f01280 100644
Binary files a/Release/view1090.exe and b/Release/view1090.exe differ
diff --git a/coaa1090.obj b/coaa1090.obj
index f62c363..d7db493 100644
Binary files a/coaa1090.obj and b/coaa1090.obj differ
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/Makefile b/makedump1090
similarity index 60%
copy from Makefile
copy to makedump1090
index f8309e7..51a7756 100644
--- a/Makefile
+++ b/makedump1090
@@ -15,7 +15,7 @@ LIBS=`pkg-config --libs librtlsdr` -lpthread -lm
CC=gcc
-all: dump1090 view1090 ppup1090
+all: dump1090
%.o: %.c
$(CC) $(CFLAGS) $(EXTRACFLAGS) -c $<
@@ -23,11 +23,5 @@ all: dump1090 view1090 ppup1090
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)
-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
diff --git a/Makefile b/makeppup1090
similarity index 59%
copy from Makefile
copy to makeppup1090
index f8309e7..ece4450 100644
--- a/Makefile
+++ b/makeppup1090
@@ -2,7 +2,7 @@
# 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
+PROGNAME=ppup1090
ifdef PREFIX
BINDIR=$(PREFIX)/bin
@@ -15,19 +15,13 @@ LIBS=`pkg-config --libs librtlsdr` -lpthread -lm
CC=gcc
-all: dump1090 view1090 ppup1090
+all: ppup1090
%.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)
-
-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 ppup1090
diff --git a/Makefile b/makeview1090
similarity index 58%
copy from Makefile
copy to makeview1090
index f8309e7..67b25a8 100644
--- a/Makefile
+++ b/makeview1090
@@ -2,7 +2,7 @@
# 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
+PROGNAME=view1090
ifdef PREFIX
BINDIR=$(PREFIX)/bin
@@ -15,19 +15,13 @@ LIBS=`pkg-config --libs librtlsdr` -lpthread -lm
CC=gcc
-all: dump1090 view1090 ppup1090
+all: view1090
%.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)
-
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 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 <IPv4> TCP Beast output listen IPv4 (default: 127.0.0.1)\n"
"--net-bo-port <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 =========================
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/dump1090.git
More information about the pkg-hamradio-commits
mailing list