|
From: <sv...@va...> - 2009-06-15 06:20:18
|
Author: njn
Date: 2009-06-15 07:19:59 +0100 (Mon, 15 Jun 2009)
New Revision: 10332
Log:
Merge include/Makefile.am and include/vki/Makefile.am, and use some more
automake built-ins.
Removed:
branches/BUILD_TWEAKS/include/vki/Makefile.am
Modified:
branches/BUILD_TWEAKS/configure.in
branches/BUILD_TWEAKS/include/Makefile.am
Modified: branches/BUILD_TWEAKS/configure.in
===================================================================
--- branches/BUILD_TWEAKS/configure.in 2009-06-15 06:10:41 UTC (rev 10331)
+++ branches/BUILD_TWEAKS/configure.in 2009-06-15 06:19:59 UTC (rev 10332)
@@ -1873,7 +1873,6 @@
perf/Makefile
perf/vg_perf
include/Makefile
- include/vki/Makefile
auxprogs/Makefile
mpi/Makefile
coregrind/Makefile
Modified: branches/BUILD_TWEAKS/include/Makefile.am
===================================================================
--- branches/BUILD_TWEAKS/include/Makefile.am 2009-06-15 06:10:41 UTC (rev 10331)
+++ branches/BUILD_TWEAKS/include/Makefile.am 2009-06-15 06:19:59 UTC (rev 10332)
@@ -1,9 +1,7 @@
-SUBDIRS = vki
-
-incincdir = $(includedir)/valgrind
-
-incinc_HEADERS = \
+# The "nobase" means that the vki/ path on some of them will be preserved
+# when they are installed into $(includedir)/valgrind.
+nobase_pkginclude_HEADERS = \
pub_tool_basics.h \
pub_tool_basics_asm.h \
pub_tool_aspacehl.h \
@@ -37,4 +35,25 @@
pub_tool_vkiscnums.h \
pub_tool_wordfm.h \
pub_tool_xarray.h \
- valgrind.h
+ valgrind.h \
+ vki/vki-linux.h \
+ vki/vki-darwin.h \
+ vki/vki-posixtypes-amd64-linux.h\
+ vki/vki-posixtypes-ppc32-linux.h\
+ vki/vki-posixtypes-ppc64-linux.h\
+ vki/vki-posixtypes-x86-linux.h \
+ vki/vki-amd64-linux.h \
+ vki/vki-ppc32-linux.h \
+ vki/vki-ppc64-linux.h \
+ vki/vki-x86-linux.h \
+ vki/vki-scnums-amd64-linux.h \
+ vki/vki-scnums-ppc32-linux.h \
+ vki/vki-scnums-ppc64-linux.h \
+ vki/vki-scnums-x86-linux.h \
+ vki/vki-scnums-darwin.h
+
+noinst_HEADERS = \
+ vki/vki-ppc32-aix5.h \
+ vki/vki-ppc64-aix5.h \
+ vki/vki-scnums-aix5.h
+
Deleted: branches/BUILD_TWEAKS/include/vki/Makefile.am
===================================================================
--- branches/BUILD_TWEAKS/include/vki/Makefile.am 2009-06-15 06:10:41 UTC (rev 10331)
+++ branches/BUILD_TWEAKS/include/vki/Makefile.am 2009-06-15 06:19:59 UTC (rev 10332)
@@ -1,24 +0,0 @@
-
-incincdir = $(includedir)/valgrind/vki
-
-incinc_HEADERS = \
- vki-linux.h \
- vki-darwin.h \
- vki-posixtypes-amd64-linux.h \
- vki-posixtypes-ppc32-linux.h \
- vki-posixtypes-ppc64-linux.h \
- vki-posixtypes-x86-linux.h \
- vki-amd64-linux.h \
- vki-ppc32-linux.h \
- vki-ppc64-linux.h \
- vki-x86-linux.h \
- vki-scnums-amd64-linux.h \
- vki-scnums-ppc32-linux.h \
- vki-scnums-ppc64-linux.h \
- vki-scnums-x86-linux.h \
- vki-scnums-darwin.h
-
-noinst_HEADERS = \
- vki-ppc32-aix5.h \
- vki-ppc64-aix5.h \
- vki-scnums-aix5.h
|