rearrange includes to always be: internal GR, external, with GR.

[debian/gnuradio] / gr-gcell / src / Makefile.am

diff --git a/gr-gcell/src/Makefile.am b/gr-gcell/src/Makefile.am
index 83dc30f45789a9710515da88affbe4fd80b055b1..60ec6cc731ce9b785ec6b84f686f27fae40195b0 100644 (file)
--- a/gr-gcell/src/Makefile.am
+++ b/gr-gcell/src/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2008,2009 Free Software Foundation, Inc.
+# Copyright 2008,2009,2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -22,11 +22,7 @@ include $(top_srcdir)/Makefile.common
 
 SUBDIRS = . examples
 
-EXTRA_DIST = run_tests.in
-
-TESTS = run_tests
-
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(GCELL_INCLUDES) \
+AM_CPPFLAGS = $(GCELL_INCLUDES) $(STD_DEFINES_AND_INCLUDES) \
        $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
 # ----------------------------------------------------------------
@@ -43,24 +39,27 @@ DISTCLEANFILES = \
 # ----------------------------------------------------------------
 
 # the library for the C++ blocks
-lib_LTLIBRARIES = libgr_gcell.la
+lib_LTLIBRARIES = libgnuradio_gcell.la
 
-libgr_gcell_la_SOURCES = \
+libgnuradio_gcell_la_SOURCES = \
        gcell_fft_vcc.cc
 
 # C/C++ headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS = \
        gcell_fft_vcc.h
 
-libgr_gcell_la_LIBADD = \
+libgnuradio_gcell_la_LIBADD = \
        $(GNURADIO_CORE_LA) \
        $(GCELL_LA)
 
-libgr_gcell_la_LDFLAGS = $(NO_UNDEFINED)
+libgnuradio_gcell_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
 
+if PYTHON
 # ----------------------------------------------------------------
 #                         SWIG stuff
 # ----------------------------------------------------------------
+EXTRA_DIST = run_tests.in
+TESTS = run_tests
 
 TOP_SWIG_IFILES =              \
        gcell.i
@@ -78,7 +77,7 @@ gcell_swig_args =             \
 
 # additional libraries for linking with the SWIG-generated library
 gcell_la_swig_libadd =         \
-       libgr_gcell.la
+       libgnuradio_gcell.la
 
 # additional SWIG files to be installed
 gcell_swiginclude_headers =    \
@@ -92,3 +91,4 @@ BUILT_SOURCES = $(swig_built_sources)
 
 # Do not distribute the output of SWIG
 no_dist_files = $(swig_built_sources)
+endif