Volk: first steps to conditional compilation/multiple obj files.

1 files changed, 11 insertions, 70 deletions

diff --git a/volk/lib/Makefile.am b/volk/lib/Makefile.am
index cf8c4f407..298895e2a 100644
--- a/volk/lib/Makefile.am
+++ b/volk/lib/Makefile.am
@@ -1,23 +1,7 @@
-#
-# Copyright 2010,2011 Free Software Foundation, Inc.
-# 
-# This file is part of GNU Radio
-# 
-# GNU Radio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-# 
-# GNU Radio is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
 
+# This file is automatically generated by make_makefile_am.py.
+# Do not edit this file.
+    
 include $(top_srcdir)/Makefile.common
 
 #FIXME: forcing the top_builddir for distcheck seems like a bit
@@ -26,34 +10,11 @@ include $(top_srcdir)/Makefile.common
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) \
 	-I$(top_builddir)/include \
-	$(LV_CXXFLAGS) $(WITH_INCLUDES)
-
-
-# We build 1 library and 1 executable here.  The library contains
-# everything except the QA code. The C++ QA code is especially recommended
-# when you have general purpose C or C++ code that may not get
-# thoroughly exercised by building and running a GR block.  The
-# executable runs the QA code at "make check" time.
-#
-#
-#
-# N.B., If there's a SWIG generated shared library and associated
-# python code, it will be contained in ../python, not here.  (That
-# code is conditionally built depending on the state of the
-# --without-python configure option.)  However, the .i should be here
-# next to the .h that it's based on.
-
-
-# list of programs run by "make check" and "make distcheck"
-#TESTS = testqa
-#orc stuff gets built in the ORC directory conditional to ORC being enabled.
-#it gets linked in during the build of libvolk as an added library.
-#there might be a better way to do this.
+	$(WITH_INCLUDES)
 
 lib_LTLIBRARIES = \
 	libvolk.la \
 	libvolk_runtime.la
-	libvolk_orc.la
 
 EXTRA_DIST = \
 	volk_mktables.c		\
@@ -82,6 +43,7 @@ volk_orc_LDFLAGS = \
 
 volk_orc_LIBADD = \
 	../orc/libvolk_orc.la
+    
 
 if LV_HAVE_ORC
 libvolk_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 $(volk_orc_LDFLAGS)
@@ -97,39 +59,29 @@ endif
 # ----------------------------------------------------------------
 #        The QA library.  Note libvolk.la in LIBADD
 # ----------------------------------------------------------------
-#libvolk_qa_la_SOURCES = \
-#	qa_utils.cc
+#libvolk_qa_la_SOURCES = #	qa_utils.cc
 
 #libvolk_qa_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 -lboost
 
-#libvolk_qa_la_LIBADD = \
-#	libvolk.la \
-#	libvolk_runtime.la
+#libvolk_qa_la_LIBADD = #	libvolk.la #	libvolk_runtime.la
 
 # ----------------------------------------------------------------
 # headers that don't get installed
 # ----------------------------------------------------------------
-noinst_HEADERS = \
-	volk_init.h \
-	qa_utils.h
+noinst_HEADERS = 	volk_init.h 	qa_utils.h
 
 # ----------------------------------------------------------------
 # Our test program
 # ----------------------------------------------------------------
-noinst_PROGRAMS = \
-	testqa
+noinst_PROGRAMS = 	testqa
 
 testqa_SOURCES = testqa.cc qa_utils.cc
 testqa_CPPFLAGS = -DBOOST_TEST_DYN_LINK -DBOOST_TEST_MAIN $(AM_CPPFLAGS)
 testqa_LDFLAGS = $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
 if LV_HAVE_ORC
-testqa_LDADD  = \
-	libvolk.la \
-	libvolk_runtime.la \
-	../orc/libvolk_orc.la
+testqa_LDADD  = 	libvolk.la 	libvolk_runtime.la 	../orc/libvolk_orc.la
 else 
-testqa_LDADD  = \
-	libvolk.la
+testqa_LDADD  = 	libvolk.la
 endif
 
 distclean-local: 
@@ -144,14 +96,3 @@ distclean-local:
 	rm -f volk_runtime.c
 	rm -f volk_tables.h
 	rm -f volk_environment_init.c
-#SUBDIRS = 
-
-#ifdef BUILD_SSE
-#SUBDIRS += sse
-#elif BUILD_SPU
-#SUBDIRS += spu
-#else
-#SUBDIRS += port
-#endif
-
-