From 9470ce9304c2e9f611927544e32e3666f675bf21 Mon Sep 17 00:00:00 2001
From: Karl Lehenbauer <karl@flightaware.com>
Date: Tue, 26 Aug 2014 15:53:37 +0000
Subject: [PATCH] Remove faup1090 Makefile ref to coaa1090.obj

* It isn't needed.

* Also include /usr/share/dpkg/buildflags.mk in Makefile and makefaup1090
and add our compile-specific CFLAGS to the CFLAGS that sets up
so we compile with the preferred Debian build flags.
---
 Makefile     | 5 ++++-
 makefaup1090 | 7 +++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index deffcad..46a91ad 100644
--- a/Makefile
+++ b/Makefile
@@ -4,13 +4,16 @@
 #
 PROGNAME=dump1090
 
+include /usr/share/dpkg/buildflags.mk
+
 ifdef PREFIX
 BINDIR=$(PREFIX)/bin
 SHAREDIR=$(PREFIX)/share/$(PROGNAME)
 EXTRACFLAGS=-DHTMLPATH=\"$(SHAREDIR)\"
 endif
 
-CFLAGS=-O2 -g -Wall -W `pkg-config --cflags librtlsdr`
+#CFLAGS=-O2 -g -Wall -W `pkg-config --cflags librtlsdr`
+CFLAGS+= `pkg-config --cflags librtlsdr`
 LIBS=`pkg-config --libs librtlsdr` -lpthread -lm
 CC=gcc
 
diff --git a/makefaup1090 b/makefaup1090
index 0c4784c..a5b6bb3 100644
--- a/makefaup1090
+++ b/makefaup1090
@@ -4,13 +4,16 @@
 #
 PROGNAME=faup1090
 
+include /usr/share/dpkg/buildflags.mk
+
 ifdef PREFIX
 BINDIR=$(PREFIX)/bin
 SHAREDIR=$(PREFIX)/share/$(PROGNAME)
 EXTRACFLAGS=-DHTMLPATH=\"$(SHAREDIR)\"
 endif
 
-CFLAGS=-O2 -g -Wall -W `pkg-config --cflags librtlsdr`
+#CFLAGS=-O2 -g -Wall -W `pkg-config --cflags librtlsdr`
+CFLAGS+=-Wall -W `pkg-config --cflags librtlsdr`
 LIBS=`pkg-config --libs librtlsdr` -lpthread -lm
 CC=gcc
 
@@ -25,7 +28,7 @@ faup1090.o: faup1090.c faup1090.h
 faup1090: faup1090.o
 
 faup1090: faup1090.o anet.o interactive.o mode_ac.o mode_s.o net_io.o
-	$(CC) -g -o faup1090 faup1090.o anet.o interactive.o mode_ac.o mode_s.o net_io.o coaa1090.obj $(LIBS) $(LDFLAGS)
+	$(CC) $(LDFLAGS) -g -o faup1090 faup1090.o anet.o interactive.o mode_ac.o mode_s.o net_io.o $(LIBS)
 
 install: faup1090
 	install faup1090 /usr/bin/faup1090