From: Nicholas Nethercote <njn@valgrind.org>
Date: Fri, 10 Jun 2005 04:46:19 +0000 (+0000)
Subject: Put arch-specific Cachegrind code in files in the main cachegrind/
X-Git-Tag: svn/VALGRIND_3_0_0~453
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bde51e15750e7a8f0164b97a6ca380b7fbfdebec;p=thirdparty%2Fvalgrind.git

Put arch-specific Cachegrind code in files in the main cachegrind/
directory, instead of subdirectories.  This is simpler and consistent
with how the rest of system is now structured.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3865
---

diff --git a/cachegrind/Makefile.am b/cachegrind/Makefile.am
index 9c607e6fb9..e981aaf68e 100644
--- a/cachegrind/Makefile.am
+++ b/cachegrind/Makefile.am
@@ -1,12 +1,4 @@
-##include $(top_srcdir)/Makefile.tool.am
-include $(top_srcdir)/Makefile.all.am
-include $(top_srcdir)/Makefile.tool-flags.am
-include $(top_srcdir)/Makefile.tool-inplace.am
-
-SUBDIRS      = $(VG_ARCH)     . tests docs
-DIST_SUBDIRS = $(VG_ARCH_ALL) . tests docs
-
-AM_CPPFLAGS += -I$(top_srcdir)/cachegrind/$(VG_ARCH)
+include $(top_srcdir)/Makefile.tool.am
 
 bin_SCRIPTS = cg_annotate
 
@@ -16,7 +8,8 @@ noinst_HEADERS = cg_arch.h
 
 val_PROGRAMS = vgtool_cachegrind.so
 
-vgtool_cachegrind_so_SOURCES = cg_main.c
+vgtool_cachegrind_so_SOURCES = \
+	cg_main.c \
+	cg-@VG_ARCH@.c
 vgtool_cachegrind_so_LDFLAGS = -shared
-vgtool_cachegrind_so_LDADD   = ${VG_ARCH}/libcgarch.a
 
diff --git a/cachegrind/amd64/Makefile.am b/cachegrind/amd64/Makefile.am
deleted file mode 100644
index 53d27a1b0c..0000000000
--- a/cachegrind/amd64/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-include $(top_srcdir)/Makefile.tool-flags.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/cachegrind
-
-noinst_LIBRARIES = libcgarch.a
-
-libcgarch_a_SOURCES = cg_arch.c
diff --git a/cachegrind/arm/Makefile.am b/cachegrind/arm/Makefile.am
deleted file mode 100644
index 53d27a1b0c..0000000000
--- a/cachegrind/arm/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-include $(top_srcdir)/Makefile.tool-flags.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/cachegrind
-
-noinst_LIBRARIES = libcgarch.a
-
-libcgarch_a_SOURCES = cg_arch.c
diff --git a/cachegrind/amd64/cg_arch.c b/cachegrind/cg-amd64.c
similarity index 99%
rename from cachegrind/amd64/cg_arch.c
rename to cachegrind/cg-amd64.c
index 8d14da37c5..6aa35a717d 100644
--- a/cachegrind/amd64/cg_arch.c
+++ b/cachegrind/cg-amd64.c
@@ -1,6 +1,6 @@
 
 /*--------------------------------------------------------------------*/
-/*--- AMD64-specific definitions.                  amd64/cg_arch.c ---*/
+/*--- AMD64-specific definitions.                       cg-amd64.c ---*/
 /*--------------------------------------------------------------------*/
 
 /*
diff --git a/cachegrind/arm/cg_arch.c b/cachegrind/cg-arm.c
similarity index 96%
rename from cachegrind/arm/cg_arch.c
rename to cachegrind/cg-arm.c
index 9800069aa3..eb1a5874c8 100644
--- a/cachegrind/arm/cg_arch.c
+++ b/cachegrind/cg-arm.c
@@ -1,6 +1,6 @@
 
 /*--------------------------------------------------------------------*/
-/*--- ARM-specific definitions.                      arm/cg_arch.c ---*/
+/*--- ARM-specific definitions.                           cg-arm.c ---*/
 /*--------------------------------------------------------------------*/
 
 /*
diff --git a/cachegrind/x86/cg_arch.c b/cachegrind/cg-x86.c
similarity index 99%
rename from cachegrind/x86/cg_arch.c
rename to cachegrind/cg-x86.c
index 36ab3a68dc..6ce7b60304 100644
--- a/cachegrind/x86/cg_arch.c
+++ b/cachegrind/cg-x86.c
@@ -1,6 +1,6 @@
 
 /*--------------------------------------------------------------------*/
-/*--- x86-specific definitions.                      x86/cg_arch.c ---*/
+/*--- x86-specific definitions.                           cg-x86.c ---*/
 /*--------------------------------------------------------------------*/
 
 /*
diff --git a/cachegrind/x86/.cvsignore b/cachegrind/x86/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/cachegrind/x86/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/cachegrind/x86/Makefile.am b/cachegrind/x86/Makefile.am
deleted file mode 100644
index 53d27a1b0c..0000000000
--- a/cachegrind/x86/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-include $(top_srcdir)/Makefile.tool-flags.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/cachegrind
-
-noinst_LIBRARIES = libcgarch.a
-
-libcgarch_a_SOURCES = cg_arch.c
diff --git a/configure.in b/configure.in
index 0aed2b8cac..88b8d8a3b4 100644
--- a/configure.in
+++ b/configure.in
@@ -444,9 +444,6 @@ AC_OUTPUT(
    memcheck/tests/x86/Makefile
    memcheck/docs/Makefile
    cachegrind/Makefile
-   cachegrind/amd64/Makefile
-   cachegrind/arm/Makefile
-   cachegrind/x86/Makefile
    cachegrind/tests/Makefile
    cachegrind/tests/amd64/Makefile
    cachegrind/tests/arm/Makefile