[hamradio-commits] [dump1090] 319/373: replace the myriad of Makefiles with one that, you know, works.

[Matthew Ernisse]

This is an automated email from the git hooks/post-receive script.

mernisse-guest pushed a commit to branch backport
in repository dump1090.

commit 878ec76daec13ae76cb2c0b6f49d6dea24734e3a
Author: Matthew Ernisse <mernisse at ub3rgeek.net>
Date:   Tue Aug 12 13:21:13 2014 -0400

    replace the myriad of Makefiles with one that, you know, works.
---
 Makefile     | 21 ++++++++++++++++-----
 makedump1090 | 27 ---------------------------
 makeppup1090 | 27 ---------------------------
 makeview1090 | 27 ---------------------------
 4 files changed, 16 insertions(+), 86 deletions(-)

diff --git a/Makefile b/Makefile
index 6bfe9ee..15b7b19 100644
--- a/Makefile
+++ b/Makefile
@@ -2,20 +2,22 @@
 # 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
+ifndef PREFIX
+PREFIX=/usr/local
+endif
+
 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 view1090
+all: dump1090 ppup1090 view1090
 
 %.o: %.c
 	$(CC) $(CFLAGS) $(EXTRACFLAGS) -c $<
@@ -23,8 +25,17 @@ all: dump1090 view1090
 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) $(LDFLAGS)
 
+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) $(LDFLAGS)
+
 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) $(LDFLAGS)
 
 clean:
-	rm -f *.o dump1090 view1090
+	rm -f *.o dump1090 ppup1090 view1090
+
+install:
+	install -m755 dump1090 $(BINDIR)
+	install -m755 ppup1090 $(BINDIR)
+	install -m755 view1090 $(BINDIR)
+	install -m644 public_html $(SHAREDIR)
diff --git a/makedump1090 b/makedump1090
deleted file mode 100644
index 4d3fccb..0000000
--- a/makedump1090
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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) $(LDFLAGS)
-
-clean:
-	rm -f *.o dump1090
diff --git a/makeppup1090 b/makeppup1090
deleted file mode 100644
index 9df60aa..0000000
--- a/makeppup1090
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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) $(LDFLAGS)
-
-clean:
-	rm -f *.o ppup1090
diff --git a/makeview1090 b/makeview1090
deleted file mode 100644
index 6cb76af..0000000
--- a/makeview1090
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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) $(LDFLAGS)
-
-clean:
-	rm -f *.o view1090

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/dump1090.git