From a484de90ccf45ca7029497a66d089bd4c781c40f Mon Sep 17 00:00:00 2001
From: Nick Foster <nick@nerdnetworks.org>
Date: Sun, 17 Apr 2011 16:11:11 -0700
Subject: Volk: make_makefile_am.py changes for include dirs

---
 volk/include/volk/Makefile.am         | 1 +
 volk/include/volk/make_makefile_am.py | 7 +------
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'volk/include')

diff --git a/volk/include/volk/Makefile.am b/volk/include/volk/Makefile.am
index 876bb7a60d..9a665f59e0 100644
--- a/volk/include/volk/Makefile.am
+++ b/volk/include/volk/Makefile.am
@@ -33,6 +33,7 @@ volkinclude_HEADERS = \
 	volk_registry.h \
 	volk.h \
 	volk_cpu.h \
+	volk_machines.h \
 	volk_environment_init.h \
 	volk_16i_x5_add_quad_16i_x4_a16.h \
 	volk_16i_branch_4_state_8_a16.h \
diff --git a/volk/include/volk/make_makefile_am.py b/volk/include/volk/make_makefile_am.py
index c737308596..1e43634f63 100644
--- a/volk/include/volk/make_makefile_am.py
+++ b/volk/include/volk/make_makefile_am.py
@@ -47,10 +47,6 @@ libvolk_la_SOURCES = 	\
 	volk_rank_archs.c	\
 	volk_machines.cc
 
-	
-libvolk_la_LDFLAGS =
-libvolk_la_LIBADD = 
-
 if LV_HAVE_ORC
 volk_orc_CFLAGS = -DLV_HAVE_ORC=1
 volk_orc_LDFLAGS = $(ORC_LDFLAGS) -lorc-0.4
@@ -73,8 +69,7 @@ noinst_LTLIBRARIES =
     for machine_name in machines:
         tempstring += "if LV_MACHINE_" + machine_name.swapcase() + "\n"
 	tempstring += "libvolk_" + machine_name + "_la_SOURCES = volk_machine_" + machine_name + ".cc\n"
-        tempstring += "libvolk_" + machine_name + "_la_CPPFLAGS = -I$(top_builddir)/include $(volk_orc_CFLAGS) "
-	#tempstring += "libvolk_" + machine_name + "_la_CPPFLAGS = -I$(top_builddir)/include "
+        tempstring += "libvolk_" + machine_name + "_la_CPPFLAGS = -I$(top_srcdir)/include $(volk_orc_CFLAGS) "
         for arch in machines[machine_name]:
             if archflags_dict[arch] != "none":
                 tempstring += "-" + archflags_dict[arch] + " "
-- 
cgit v1.2.3