summaryrefslogtreecommitdiff
path: root/gr-fcd/lib
diff options
context:
space:
mode:
authorJohnathan Corgan2012-03-08 16:53:03 -0800
committerJohnathan Corgan2012-03-09 11:02:35 -0800
commit15b215a42472c478a8b45e1be293de3eca6d2ee9 (patch)
treeed3fd1322dc72eb2e12a9214028b6cd1f6346da0 /gr-fcd/lib
parent7361ce25f30ddfcc7538fec4a8b4cb9044201a03 (diff)
downloadgnuradio-15b215a42472c478a8b45e1be293de3eca6d2ee9.tar.gz
gnuradio-15b215a42472c478a8b45e1be293de3eca6d2ee9.tar.bz2
gnuradio-15b215a42472c478a8b45e1be293de3eca6d2ee9.zip
fcd: convert out-of-tree autotools build to in-tree
This still needs doc directory conversion to new documentation system.
Diffstat (limited to 'gr-fcd/lib')
-rw-r--r--gr-fcd/lib/Makefile.am49
1 files changed, 23 insertions, 26 deletions
diff --git a/gr-fcd/lib/Makefile.am b/gr-fcd/lib/Makefile.am
index 76192bbd9..23da5ba49 100644
--- a/gr-fcd/lib/Makefile.am
+++ b/gr-fcd/lib/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2004,2005,2006,2008,2009,2010 Free Software Foundation, Inc.
+# Copyright 2004,2005,2006,2008,2009,2010,2012 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -21,42 +21,39 @@
include $(top_srcdir)/Makefile.common
-# ----------------------------------------------------------------
-# Funcube Dongle C++ library: libgnuradio-fcd.so
-# ----------------------------------------------------------------
+AM_CPPFLAGS = \
+ $(STD_DEFINES_AND_INCLUDES) \
+ $(WITH_INCLUDES) \
+ $(USB_CPPFLAGS) \
+ -I$(top_srcdir)/gr-audio/include
-# C/C++ headers get installed in ${prefix}/include/$(modname)
-modinclude_HEADERS = \
- fcd_source_c.h
-
-noinst_HEADERS = \
- fcd.h \
- fcdhidcmd.h \
- hidapi.h
-
-lib_LTLIBRARIES = libgnuradio-fcd.la
+lib_LTLIBRARIES = \
+ libgnuradio-fcd.la
-## FIXME: only linux; mac and win use other hidapi source
libgnuradio_fcd_la_SOURCES = \
- fcd_source_c.cc \
- fcd.c
+ fcd_source_c.cc \
+ fcd.c
-if MACOSX
+if FCD_MACOSX
libgnuradio_fcd_la_SOURCES += hidmac.c
-else
-if WINDOWS
+else if FCD_WINDOWS
libgnuradio_fcd_la_SOURCES += hidwin.c
else
libgnuradio_fcd_la_SOURCES += hid-libusb.c
endif
-endif
+
+noinst_HEADERS = \
+ fcd.h \
+ fcdhidcmd.h \
+ hidapi.h
libgnuradio_fcd_la_LIBADD = \
- $(GNURADIO_CORE_LA) \
- $(GNURADIO_AUDIO_LA)
+ $(GNURADIO_CORE_LA) \
+ $(top_builddir)/gr-audio/lib/libgnuradio-audio.la \
+ $(GNURADIO_AUDIO_LA) \
+ $(USB_LIBS)
libgnuradio_fcd_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
-# ----------------------------------------------------------------
-# No dedicated QA code for FCD source. Use the apps for testing
-# ----------------------------------------------------------------
+grinclude_HEADERS = \
+ fcd_source_c.h