summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Krysik <perper@o2.pl>2009-05-20 21:15:48 +0200
committerPiotr Krysik <perper@o2.pl>2009-05-20 21:15:48 +0200
commit29eae4c8d199fe15cdfa6c871847151955c3724d (patch)
treee061b718b6e0232371256047f6f3517da6216717
parentf0532c01b907c0dcb1fb0f5efe9e9be9c47afc4f (diff)
changes to makefiles.am to add decoding library - neds a little cleanup
-rw-r--r--Makefile.am1
-rw-r--r--Makefile.common8
-rw-r--r--configure.ac4
-rw-r--r--src/lib/Makefile.am7
4 files changed, 15 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index f940fe8..863aebb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,4 +17,3 @@ EXTRA_DIST = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gsm-receiver.pc
- \ No newline at end of file
diff --git a/Makefile.common b/Makefile.common
index 6b62f25..7bd8dac 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -19,6 +19,14 @@
# the Free Software Foundation, Inc., 51 Franklin Street,
# Boston, MA 02110-1301, USA.
#
+DECODER_INCLUDEDIR = $(top_srcdir)/src/lib/decoder
+MAIN_INCLUDEDIR = $(top_srcdir)/src/lib
+
+#STD_DEFINES_AND_INCLUDES = \
+# -I$(DECODER_INCLUDEDIR) \
+# -I$(MAIN_INCLUDEDIR)
+
+DECODER_LA = $(top_builddir)/src/lib/decoder/libdecoder.la
# includes
grincludedir = $(includedir)/gnuradio
diff --git a/configure.ac b/configure.ac
index 556d5c5..aa33970 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,9 +105,9 @@ AC_CONFIG_FILES([\
config/Makefile \
src/Makefile \
src/lib/Makefile \
+ src/lib/decoder/Makefile \
src/python/Makefile \
- gsm-receiver.pc \
-
+ gsm-receiver.pc
])
# doc/Makefile \
# src/python/run_tests \
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index bec9b80..78c7511 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -21,6 +21,7 @@
include $(top_srcdir)/Makefile.common
+SUBDIRS = decoder
# Install this stuff so that it ends up as the gnuradio.howto module
# This usually ends up at:
# ${prefix}/lib/python${python_version}/site-packages/gnuradio
@@ -28,7 +29,7 @@ include $(top_srcdir)/Makefile.common
ourpythondir = $(grpythondir)
ourlibdir = $(grpyexecdir)
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) -I$(DECODER_INCLUDEDIR)
SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(SWIGGRFLAGS) $(WITH_SWIG_INCLUDES) \
$(WITH_INCLUDES)
@@ -75,7 +76,9 @@ _gsm_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
_gsm_la_LIBADD = \
$(PYTHON_LDFLAGS) \
libgsmdemod.la \
- -lstdc++
+ -lstdc++ \
+ decoder/libdecoder.la
+# $(DECODER_LA)
#libgsmdemod_la_LIBADD =
personal git repositories of Harald Welte. Your mileage may vary