changes to makefiles.am to add decoding library - neds a little cleanup
This commit is contained in:
parent
f0532c01b9
commit
29eae4c8d1
|
@ -17,4 +17,3 @@ EXTRA_DIST = \
|
|||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = gsm-receiver.pc
|
||||
|
|
@ -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
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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 =
|
||||
|
||||
|
|
Loading…
Reference in New Issue