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.
This commit is contained in:
Karl Lehenbauer 2014-08-26 15:53:37 +00:00
parent 05e80ee305
commit 9470ce9304
2 changed files with 9 additions and 3 deletions

View File

@ -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

View File

@ -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