diff options
author | sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2009-02-22 23:40:31 +0000 |
---|---|---|
committer | sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2009-02-22 23:40:31 +0000 |
commit | 4d3f7a4a171d7c1a3c58d5d4f8eb8e490b596e6b (patch) | |
tree | a9d7acd49bc4dbef4fc4229398665bc30bb7f0ef | |
parent | 07891f956fcdaf4ab3e458da5ad08eb6db975ffd (diff) | |
download | valgrind-4d3f7a4a171d7c1a3c58d5d4f8eb8e490b596e6b.tar.gz |
Use dashes rather than underscores in library names (njn).
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9223 a5019735-40e9-0310-863c-91ae7b9d1cf9
-rw-r--r-- | Makefile.tool.am | 60 | ||||
-rw-r--r-- | coregrind/Makefile.am | 24 |
2 files changed, 42 insertions, 42 deletions
diff --git a/Makefile.tool.am b/Makefile.tool.am index 6bcbfedc0..e65586bad 100644 --- a/Makefile.tool.am +++ b/Makefile.tool.am @@ -7,84 +7,84 @@ include $(top_srcdir)/Makefile.install.am LIBREPLACEMALLOC_X86_LINUX = \ - $(top_builddir)/coregrind/libreplacemalloc_toolpreload_x86_linux.a + $(top_builddir)/coregrind/libreplacemalloc_toolpreload-x86-linux.a LIBREPLACEMALLOC_AMD64_LINUX = \ - $(top_builddir)/coregrind/libreplacemalloc_toolpreload_amd64_linux.a + $(top_builddir)/coregrind/libreplacemalloc_toolpreload-amd64-linux.a LIBREPLACEMALLOC_PPC32_LINUX = \ - $(top_builddir)/coregrind/libreplacemalloc_toolpreload_ppc32_linux.a + $(top_builddir)/coregrind/libreplacemalloc_toolpreload-ppc32-linux.a LIBREPLACEMALLOC_PPC64_LINUX = \ - $(top_builddir)/coregrind/libreplacemalloc_toolpreload_ppc64_linux.a + $(top_builddir)/coregrind/libreplacemalloc_toolpreload-ppc64-linux.a LIBREPLACEMALLOC_PPC32_AIX5 = \ - $(top_builddir)/coregrind/libreplacemalloc_toolpreload_ppc32_aix5.a + $(top_builddir)/coregrind/libreplacemalloc_toolpreload-ppc32-aix5.a LIBREPLACEMALLOC_PPC64_AIX5 = \ - $(top_builddir)/coregrind/libreplacemalloc_toolpreload_ppc64_aix5.a + $(top_builddir)/coregrind/libreplacemalloc_toolpreload-ppc64-aix5.a COREGRIND_LIBS_X86_LINUX = \ - $(top_builddir)/coregrind/libcoregrind_x86_linux.a \ - @VEX_DIR@/libvex_x86_linux.a + $(top_builddir)/coregrind/libcoregrind-x86-linux.a \ + @VEX_DIR@/libvex-x86-linux.a COREGRIND_LIBS_AMD64_LINUX = \ - $(top_builddir)/coregrind/libcoregrind_amd64_linux.a \ - @VEX_DIR@/libvex_amd64_linux.a + $(top_builddir)/coregrind/libcoregrind-amd64-linux.a \ + @VEX_DIR@/libvex-amd64-linux.a COREGRIND_LIBS_PPC32_LINUX = \ - $(top_builddir)/coregrind/libcoregrind_ppc32_linux.a \ - @VEX_DIR@/libvex_ppc32_linux.a + $(top_builddir)/coregrind/libcoregrind-ppc32-linux.a \ + @VEX_DIR@/libvex-ppc32-linux.a COREGRIND_LIBS_PPC64_LINUX = \ - $(top_builddir)/coregrind/libcoregrind_ppc64_linux.a \ - @VEX_DIR@/libvex_ppc64_linux.a + $(top_builddir)/coregrind/libcoregrind-ppc64-linux.a \ + @VEX_DIR@/libvex-ppc64-linux.a COREGRIND_LIBS_PPC32_AIX5 = \ - $(top_builddir)/coregrind/libcoregrind_ppc32_aix5.a \ - @VEX_DIR@/libvex_ppc32_aix5.a + $(top_builddir)/coregrind/libcoregrind-ppc32-aix5.a \ + @VEX_DIR@/libvex-ppc32-aix5.a COREGRIND_LIBS_PPC64_AIX5 = \ - $(top_builddir)/coregrind/libcoregrind_ppc64_aix5.a \ - @VEX_DIR@/libvex_ppc64_aix5.a + $(top_builddir)/coregrind/libcoregrind-ppc64-aix5.a \ + @VEX_DIR@/libvex-ppc64-aix5.a ##.PHONY: @VEX_DIR@/libvex.a -@VEX_DIR@/libvex_x86_linux.a: @VEX_DIR@/priv/main/vex_svnversion.h +@VEX_DIR@/libvex-x86-linux.a: @VEX_DIR@/priv/main/vex_svnversion.h $(MAKE) -C @VEX_DIR@ CC="$(CC)" AR="$(AR)" \ - libvex_x86_linux.a \ + libvex-x86-linux.a \ EXTRA_CFLAGS="$(AM_CFLAGS_X86_LINUX) @FLAG_WDECL_AFTER_STMT@ \ @FLAG_FNO_STACK_PROTECTOR@" -@VEX_DIR@/libvex_amd64_linux.a: @VEX_DIR@/priv/main/vex_svnversion.h +@VEX_DIR@/libvex-amd64-linux.a: @VEX_DIR@/priv/main/vex_svnversion.h $(MAKE) -C @VEX_DIR@ CC="$(CC)" AR="$(AR)" \ - libvex_amd64_linux.a \ + libvex-amd64-linux.a \ EXTRA_CFLAGS="$(AM_CFLAGS_AMD64_LINUX) @FLAG_WDECL_AFTER_STMT@ \ @FLAG_FNO_STACK_PROTECTOR@" -@VEX_DIR@/libvex_ppc32_linux.a: @VEX_DIR@/priv/main/vex_svnversion.h +@VEX_DIR@/libvex-ppc32-linux.a: @VEX_DIR@/priv/main/vex_svnversion.h $(MAKE) -C @VEX_DIR@ CC="$(CC)" AR="$(AR)" \ - libvex_ppc32_linux.a \ + libvex-ppc32-linux.a \ EXTRA_CFLAGS="$(AM_CFLAGS_PPC32_LINUX) @FLAG_WDECL_AFTER_STMT@ \ @FLAG_FNO_STACK_PROTECTOR@" -@VEX_DIR@/libvex_ppc64_linux.a: @VEX_DIR@/priv/main/vex_svnversion.h +@VEX_DIR@/libvex-ppc64-linux.a: @VEX_DIR@/priv/main/vex_svnversion.h $(MAKE) -C @VEX_DIR@ CC="$(CC)" AR="$(AR)" \ - libvex_ppc64_linux.a \ + libvex-ppc64-linux.a \ EXTRA_CFLAGS="$(AM_CFLAGS_PPC64_LINUX) @FLAG_WDECL_AFTER_STMT@ \ @FLAG_FNO_STACK_PROTECTOR@" -@VEX_DIR@/libvex_ppc32_aix5.a: @VEX_DIR@/priv/main/vex_svnversion.h +@VEX_DIR@/libvex-ppc32-aix5.a: @VEX_DIR@/priv/main/vex_svnversion.h $(MAKE) -C @VEX_DIR@ CC="$(CC)" AR="$(AR) -X32" \ - libvex_ppc32_aix5.a \ + libvex-ppc32-aix5.a \ EXTRA_CFLAGS="$(AM_CFLAGS_PPC32_AIX5) @FLAG_WDECL_AFTER_STMT@ \ @FLAG_FNO_STACK_PROTECTOR@" -@VEX_DIR@/libvex_ppc64_aix5.a: @VEX_DIR@/priv/main/vex_svnversion.h +@VEX_DIR@/libvex-ppc64-aix5.a: @VEX_DIR@/priv/main/vex_svnversion.h $(MAKE) -C @VEX_DIR@ CC="$(CC)" AR="$(AR) -X64" \ - libvex_ppc64_aix5.a \ + libvex-ppc64-aix5.a \ EXTRA_CFLAGS="$(AM_CFLAGS_PPC64_AIX5) @FLAG_WDECL_AFTER_STMT@ \ @FLAG_FNO_STACK_PROTECTOR@" diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am index 4a7bc5abb..59695c2e9 100644 --- a/coregrind/Makefile.am +++ b/coregrind/Makefile.am @@ -35,38 +35,38 @@ LIBVEX = if VGCONF_PLATFORMS_INCLUDE_X86_LINUX noinst_PROGRAMS += vgpreload_core-x86-linux.so -pkglib_LIBRARIES += libcoregrind_x86_linux.a libreplacemalloc_toolpreload_x86_linux.a -LIBVEX += libvex_x86_linux.a +pkglib_LIBRARIES += libcoregrind-x86-linux.a libreplacemalloc_toolpreload-x86-linux.a +LIBVEX += libvex-x86-linux.a endif if VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX noinst_PROGRAMS += vgpreload_core-amd64-linux.so -pkglib_LIBRARIES += libcoregrind_amd64_linux.a libreplacemalloc_toolpreload_amd64_linux.a -LIBVEX += libvex_amd64_linux.a +pkglib_LIBRARIES += libcoregrind-amd64-linux.a libreplacemalloc_toolpreload-amd64-linux.a +LIBVEX += libvex-amd64-linux.a endif if VGCONF_PLATFORMS_INCLUDE_PPC32_LINUX noinst_PROGRAMS += vgpreload_core-ppc32-linux.so -pkglib_LIBRARIES += libcoregrind_ppc32_linux.a libreplacemalloc_toolpreload_ppc32_linux.a -LIBVEX += libvex_ppc32_linux.a +pkglib_LIBRARIES += libcoregrind-ppc32-linux.a libreplacemalloc_toolpreload-ppc32-linux.a +LIBVEX += libvex-ppc32-linux.a endif if VGCONF_PLATFORMS_INCLUDE_PPC64_LINUX noinst_PROGRAMS += vgpreload_core-ppc64-linux.so -pkglib_LIBRARIES += libcoregrind_ppc64_linux.a libreplacemalloc_toolpreload_ppc64_linux.a -LIBVEX += libvex_ppc64_linux.a +pkglib_LIBRARIES += libcoregrind-ppc64-linux.a libreplacemalloc_toolpreload-ppc64-linux.a +LIBVEX += libvex-ppc64-linux.a endif if VGCONF_PLATFORMS_INCLUDE_PPC32_AIX5 noinst_PROGRAMS += vgpreload_core-ppc32-aix5.so -pkglib_LIBRARIES += libcoregrind_ppc32_aix5.a libreplacemalloc_toolpreload_ppc32_aix5.a -LIBVEX += libvex_ppc32_aix5.a +pkglib_LIBRARIES += libcoregrind-ppc32-aix5.a libreplacemalloc_toolpreload-ppc32-aix5.a +LIBVEX += libvex-ppc32-aix5.a endif if VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5 noinst_PROGRAMS += vgpreload_core-ppc64-aix5.so -pkglib_LIBRARIES += libcoregrind_ppc64_aix5.a libreplacemalloc_toolpreload_ppc64_aix5.a -LIBVEX += libvex_ppc64_aix5.a +pkglib_LIBRARIES += libcoregrind-ppc64-aix5.a libreplacemalloc_toolpreload-ppc64-aix5.a +LIBVEX += libvex-ppc64-aix5.a endif |