From: Julian Seward Date: Tue, 23 Dec 2008 15:09:09 +0000 (+0000) Subject: Disable the building of exp-omega, but don't rm it from the repo, X-Git-Tag: svn/VALGRIND_3_4_0~24 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac2b83a58943480e7b4e2749569987154655b086;p=thirdparty%2Fvalgrind.git Disable the building of exp-omega, but don't rm it from the repo, nor from the tarball. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@8873 --- diff --git a/exp-omega/Makefile.am b/exp-omega/Makefile.am index ae16c48442..8d8da7e0a4 100644 --- a/exp-omega/Makefile.am +++ b/exp-omega/Makefile.am @@ -1,139 +1,150 @@ -include $(top_srcdir)/Makefile.tool.am -# include memcheck/ for mac_shared.h -noinst_PROGRAMS = -if VGP_X86_LINUX -noinst_PROGRAMS += exp-omega-x86-linux vgpreload_exp-omega-x86-linux.so -endif -if VGP_AMD64_LINUX -noinst_PROGRAMS += exp-omega-amd64-linux vgpreload_exp-omega-amd64-linux.so -endif -if VGP_PPC32_LINUX -noinst_PROGRAMS += exp-omega-ppc32-linux vgpreload_exp-omega-ppc32-linux.so -endif -if VGP_PPC64_LINUX -noinst_PROGRAMS += exp-omega-ppc64-linux vgpreload_exp-omega-ppc64-linux.so -endif -if VGP_PPC32_AIX5 -noinst_PROGRAMS += exp-omega-ppc32-aix5 vgpreload_exp-omega-ppc32-aix5.so -endif -if VGP_PPC64_AIX5 -noinst_PROGRAMS += exp-omega-ppc64-aix5 vgpreload_exp-omega-ppc64-aix5.so -endif - -VGPRELOAD_OMEGA_SOURCES_COMMON = o_replace_memops.c - -vgpreload_exp_omega_x86_linux_so_SOURCES = $(VGPRELOAD_OMEGA_SOURCES_COMMON) -vgpreload_exp_omega_x86_linux_so_CPPFLAGS = $(AM_CPPFLAGS_X86_LINUX) -vgpreload_exp_omega_x86_linux_so_CFLAGS = $(AM_CFLAGS_X86_LINUX) $(AM_CFLAGS_PIC) -O2 -vgpreload_exp_omega_x86_linux_so_CCASFLAGS = $(AM_CCASFLAGS_X86_LINUX) -vgpreload_exp_omega_x86_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_X86_LINUX) -vgpreload_exp_omega_x86_linux_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_X86_LINUX) \ - $(LIBREPLACEMALLOC_LDFLAGS_X86_LINUX) - -vgpreload_exp_omega_amd64_linux_so_SOURCES = $(VGPRELOAD_OMEGA_SOURCES_COMMON) -vgpreload_exp_omega_amd64_linux_so_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX) -vgpreload_exp_omega_amd64_linux_so_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) $(AM_CFLAGS_PIC) -O2 -vgpreload_exp_omega_amd64_linux_so_CCASFLAGS = $(AM_CCASFLAGS_AMD64_LINUX) -vgpreload_exp_omega_amd64_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_AMD64_LINUX) -vgpreload_exp_omega_amd64_linux_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_AMD64_LINUX) \ - $(LIBREPLACEMALLOC_LDFLAGS_AMD64_LINUX) - -vgpreload_exp_omega_ppc32_linux_so_SOURCES = $(VGPRELOAD_OMEGA_SOURCES_COMMON) -vgpreload_exp_omega_ppc32_linux_so_CPPFLAGS = $(AM_CPPFLAGS_PPC32_LINUX) -vgpreload_exp_omega_ppc32_linux_so_CFLAGS = $(AM_CFLAGS_PPC32_LINUX) $(AM_CFLAGS_PIC) -O2 -vgpreload_exp_omega_ppc32_linux_so_CCASFLAGS = $(AM_CCASFLAGS_PPC32_LINUX) -vgpreload_exp_omega_ppc32_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_PPC32_LINUX) -vgpreload_exp_omega_ppc32_linux_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_PPC32_LINUX) \ - $(LIBREPLACEMALLOC_LDFLAGS_PPC32_LINUX) - -vgpreload_exp_omega_ppc64_linux_so_SOURCES = $(VGPRELOAD_OMEGA_SOURCES_COMMON) -vgpreload_exp_omega_ppc64_linux_so_CPPFLAGS = $(AM_CPPFLAGS_PPC64_LINUX) -vgpreload_exp_omega_ppc64_linux_so_CFLAGS = $(AM_CFLAGS_PPC64_LINUX) $(AM_CFLAGS_PIC) -O2 -vgpreload_exp_omega_ppc64_linux_so_CCASFLAGS = $(AM_CCASFLAGS_PPC64_LINUX) -vgpreload_exp_omega_ppc64_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_PPC64_LINUX) -vgpreload_exp_omega_ppc64_linux_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_PPC64_LINUX) \ - $(LIBREPLACEMALLOC_LDFLAGS_PPC64_LINUX) - -vgpreload_exp_omega_ppc32_aix5_so_SOURCES = $(VGPRELOAD_OMEGA_SOURCES_COMMON) -vgpreload_exp_omega_ppc32_aix5_so_CPPFLAGS = $(AM_CPPFLAGS_PPC32_AIX5) -vgpreload_exp_omega_ppc32_aix5_so_CFLAGS = $(AM_CFLAGS_PPC32_AIX5) $(AM_CFLAGS_PIC) -O2 -vgpreload_exp_omega_ppc32_aix5_so_CCASFLAGS = $(AM_CCASFLAGS_PPC32_AIX5) -vgpreload_exp_omega_ppc32_aix5_so_DEPENDENCIES = $(LIBREPLACEMALLOC_PPC32_AIX5) -vgpreload_exp_omega_ppc32_aix5_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_PPC32_AIX5) \ - $(LIBREPLACEMALLOC_LDFLAGS_PPC32_AIX5) - -vgpreload_exp_omega_ppc64_aix5_so_SOURCES = $(VGPRELOAD_OMEGA_SOURCES_COMMON) -vgpreload_exp_omega_ppc64_aix5_so_CPPFLAGS = $(AM_CPPFLAGS_PPC64_AIX5) -vgpreload_exp_omega_ppc64_aix5_so_CFLAGS = $(AM_CFLAGS_PPC64_AIX5) $(AM_CFLAGS_PIC) -O2 -vgpreload_exp_omega_ppc64_aix5_so_CCASFLAGS = $(AM_CCASFLAGS_PPC64_AIX5) -vgpreload_exp_omega_ppc64_aix5_so_DEPENDENCIES = $(LIBREPLACEMALLOC_PPC64_AIX5) -vgpreload_exp_omega_ppc64_aix5_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_PPC64_AIX5) \ - $(LIBREPLACEMALLOC_LDFLAGS_PPC64_AIX5) - -OMEGA_SOURCES_COMMON = \ - o_main.c - -exp_omega_x86_linux_SOURCES = $(OMEGA_SOURCES_COMMON) -exp_omega_x86_linux_CPPFLAGS = $(AM_CPPFLAGS_X86_LINUX) -exp_omega_x86_linux_CFLAGS = $(AM_CFLAGS_X86_LINUX) -O2 -exp_omega_x86_linux_CCASFLAGS = $(AM_CCASFLAGS_X86_LINUX) -exp_omega_x86_linux_DEPENDENCIES = $(COREGRIND_LIBS_X86_LINUX) -exp_omega_x86_linux_LDADD = $(TOOL_LDADD_X86_LINUX) -exp_omega_x86_linux_LDFLAGS = $(TOOL_LDFLAGS_X86_LINUX) - -exp_omega_amd64_linux_SOURCES = $(OMEGA_SOURCES_COMMON) -exp_omega_amd64_linux_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX) -exp_omega_amd64_linux_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) -g -O0 #-O2 -exp_omega_amd64_linux_CCASFLAGS = $(AM_CCASFLAGS_AMD64_LINUX) -exp_omega_amd64_linux_DEPENDENCIES = $(COREGRIND_LIBS_AMD64_LINUX) -exp_omega_amd64_linux_LDADD = $(TOOL_LDADD_AMD64_LINUX) -exp_omega_amd64_linux_LDFLAGS = $(TOOL_LDFLAGS_AMD64_LINUX) - -exp_omega_ppc32_linux_SOURCES = $(OMEGA_SOURCES_COMMON) -exp_omega_ppc32_linux_CPPFLAGS = $(AM_CPPFLAGS_PPC32_LINUX) -exp_omega_ppc32_linux_CFLAGS = $(AM_CFLAGS_PPC32_LINUX) -O2 -exp_omega_ppc32_linux_CCASFLAGS = $(AM_CCASFLAGS_PPC32_LINUX) -exp_omega_ppc32_linux_DEPENDENCIES = $(COREGRIND_LIBS_PPC32_LINUX) -exp_omega_ppc32_linux_LDADD = $(TOOL_LDADD_PPC32_LINUX) -exp_omega_ppc32_linux_LDFLAGS = $(TOOL_LDFLAGS_PPC32_LINUX) - -exp_omega_ppc64_linux_SOURCES = $(OMEGA_SOURCES_COMMON) -exp_omega_ppc64_linux_CPPFLAGS = $(AM_CPPFLAGS_PPC64_LINUX) -exp_omega_ppc64_linux_CFLAGS = $(AM_CFLAGS_PPC64_LINUX) -O2 -exp_omega_ppc64_linux_CCASFLAGS = $(AM_CCASFLAGS_PPC64_LINUX) -exp_omega_ppc64_linux_DEPENDENCIES = $(COREGRIND_LIBS_PPC64_LINUX) -exp_omega_ppc64_linux_LDADD = $(TOOL_LDADD_PPC64_LINUX) -exp_omega_ppc64_linux_LDFLAGS = $(TOOL_LDFLAGS_PPC64_LINUX) - -exp_omega_ppc32_aix5_SOURCES = $(OMEGA_SOURCES_COMMON) -exp_omega_ppc32_aix5_CPPFLAGS = $(AM_CPPFLAGS_PPC32_AIX5) -exp_omega_ppc32_aix5_CFLAGS = $(AM_CFLAGS_PPC32_AIX5) -O2 -exp_omega_ppc32_aix5_CCASFLAGS = $(AM_CCASFLAGS_PPC32_AIX5) -exp_omega_ppc32_aix5_DEPENDENCIES = $(COREGRIND_LIBS_PPC32_AIX5) -exp_omega_ppc32_aix5_LDADD = $(TOOL_LDADD_PPC32_AIX5) -exp_omega_ppc32_aix5_LDFLAGS = $(TOOL_LDFLAGS_PPC32_AIX5) - -exp_omega_ppc64_aix5_SOURCES = $(OMEGA_SOURCES_COMMON) -exp_omega_ppc64_aix5_CPPFLAGS = $(AM_CPPFLAGS_PPC64_AIX5) -exp_omega_ppc64_aix5_CFLAGS = $(AM_CFLAGS_PPC64_AIX5) -O2 -exp_omega_ppc64_aix5_CCASFLAGS = $(AM_CCASFLAGS_PPC64_AIX5) -exp_omega_ppc64_aix5_DEPENDENCIES = $(COREGRIND_LIBS_PPC64_AIX5) -exp_omega_ppc64_aix5_LDADD = $(TOOL_LDADD_PPC64_AIX5) -exp_omega_ppc64_aix5_LDFLAGS = $(TOOL_LDFLAGS_PPC64_AIX5) - -oincludedir = $(includedir)/valgrind - -oinclude_HEADERS = exp-omega.h - -noinst_HEADERS = - -o_replace_memops.o: CFLAGS += -fno-omit-frame-pointer - -o_main.o: CFLAGS += -fno-omit-frame-pointer #-fomit-frame-pointer +# Don't build Omega. Bundle all the relevant stuff up into +# the tarfile, though. + +SUBDIRS = docs tests + +EXTRA_DIST = exp-omega.h o_main.c o_replace_memops.c + +###--- The original Makefile.am begins here ---### +##zz +##zz include $(top_srcdir)/Makefile.tool.am +##zz +##zz # include memcheck/ for mac_shared.h +##zz noinst_PROGRAMS = +##zz if VGP_X86_LINUX +##zz noinst_PROGRAMS += exp-omega-x86-linux vgpreload_exp-omega-x86-linux.so +##zz endif +##zz if VGP_AMD64_LINUX +##zz noinst_PROGRAMS += exp-omega-amd64-linux vgpreload_exp-omega-amd64-linux.so +##zz endif +##zz if VGP_PPC32_LINUX +##zz noinst_PROGRAMS += exp-omega-ppc32-linux vgpreload_exp-omega-ppc32-linux.so +##zz endif +##zz if VGP_PPC64_LINUX +##zz noinst_PROGRAMS += exp-omega-ppc64-linux vgpreload_exp-omega-ppc64-linux.so +##zz endif +##zz if VGP_PPC32_AIX5 +##zz noinst_PROGRAMS += exp-omega-ppc32-aix5 vgpreload_exp-omega-ppc32-aix5.so +##zz endif +##zz if VGP_PPC64_AIX5 +##zz noinst_PROGRAMS += exp-omega-ppc64-aix5 vgpreload_exp-omega-ppc64-aix5.so +##zz endif +##zz +##zz VGPRELOAD_OMEGA_SOURCES_COMMON = o_replace_memops.c +##zz +##zz vgpreload_exp_omega_x86_linux_so_SOURCES = $(VGPRELOAD_OMEGA_SOURCES_COMMON) +##zz vgpreload_exp_omega_x86_linux_so_CPPFLAGS = $(AM_CPPFLAGS_X86_LINUX) +##zz vgpreload_exp_omega_x86_linux_so_CFLAGS = $(AM_CFLAGS_X86_LINUX) $(AM_CFLAGS_PIC) -O2 +##zz vgpreload_exp_omega_x86_linux_so_CCASFLAGS = $(AM_CCASFLAGS_X86_LINUX) +##zz vgpreload_exp_omega_x86_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_X86_LINUX) +##zz vgpreload_exp_omega_x86_linux_so_LDFLAGS = \ +##zz $(PRELOAD_LDFLAGS_X86_LINUX) \ +##zz $(LIBREPLACEMALLOC_LDFLAGS_X86_LINUX) +##zz +##zz vgpreload_exp_omega_amd64_linux_so_SOURCES = $(VGPRELOAD_OMEGA_SOURCES_COMMON) +##zz vgpreload_exp_omega_amd64_linux_so_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX) +##zz vgpreload_exp_omega_amd64_linux_so_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) $(AM_CFLAGS_PIC) -O2 +##zz vgpreload_exp_omega_amd64_linux_so_CCASFLAGS = $(AM_CCASFLAGS_AMD64_LINUX) +##zz vgpreload_exp_omega_amd64_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_AMD64_LINUX) +##zz vgpreload_exp_omega_amd64_linux_so_LDFLAGS = \ +##zz $(PRELOAD_LDFLAGS_AMD64_LINUX) \ +##zz $(LIBREPLACEMALLOC_LDFLAGS_AMD64_LINUX) +##zz +##zz vgpreload_exp_omega_ppc32_linux_so_SOURCES = $(VGPRELOAD_OMEGA_SOURCES_COMMON) +##zz vgpreload_exp_omega_ppc32_linux_so_CPPFLAGS = $(AM_CPPFLAGS_PPC32_LINUX) +##zz vgpreload_exp_omega_ppc32_linux_so_CFLAGS = $(AM_CFLAGS_PPC32_LINUX) $(AM_CFLAGS_PIC) -O2 +##zz vgpreload_exp_omega_ppc32_linux_so_CCASFLAGS = $(AM_CCASFLAGS_PPC32_LINUX) +##zz vgpreload_exp_omega_ppc32_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_PPC32_LINUX) +##zz vgpreload_exp_omega_ppc32_linux_so_LDFLAGS = \ +##zz $(PRELOAD_LDFLAGS_PPC32_LINUX) \ +##zz $(LIBREPLACEMALLOC_LDFLAGS_PPC32_LINUX) +##zz +##zz vgpreload_exp_omega_ppc64_linux_so_SOURCES = $(VGPRELOAD_OMEGA_SOURCES_COMMON) +##zz vgpreload_exp_omega_ppc64_linux_so_CPPFLAGS = $(AM_CPPFLAGS_PPC64_LINUX) +##zz vgpreload_exp_omega_ppc64_linux_so_CFLAGS = $(AM_CFLAGS_PPC64_LINUX) $(AM_CFLAGS_PIC) -O2 +##zz vgpreload_exp_omega_ppc64_linux_so_CCASFLAGS = $(AM_CCASFLAGS_PPC64_LINUX) +##zz vgpreload_exp_omega_ppc64_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_PPC64_LINUX) +##zz vgpreload_exp_omega_ppc64_linux_so_LDFLAGS = \ +##zz $(PRELOAD_LDFLAGS_PPC64_LINUX) \ +##zz $(LIBREPLACEMALLOC_LDFLAGS_PPC64_LINUX) +##zz +##zz vgpreload_exp_omega_ppc32_aix5_so_SOURCES = $(VGPRELOAD_OMEGA_SOURCES_COMMON) +##zz vgpreload_exp_omega_ppc32_aix5_so_CPPFLAGS = $(AM_CPPFLAGS_PPC32_AIX5) +##zz vgpreload_exp_omega_ppc32_aix5_so_CFLAGS = $(AM_CFLAGS_PPC32_AIX5) $(AM_CFLAGS_PIC) -O2 +##zz vgpreload_exp_omega_ppc32_aix5_so_CCASFLAGS = $(AM_CCASFLAGS_PPC32_AIX5) +##zz vgpreload_exp_omega_ppc32_aix5_so_DEPENDENCIES = $(LIBREPLACEMALLOC_PPC32_AIX5) +##zz vgpreload_exp_omega_ppc32_aix5_so_LDFLAGS = \ +##zz $(PRELOAD_LDFLAGS_PPC32_AIX5) \ +##zz $(LIBREPLACEMALLOC_LDFLAGS_PPC32_AIX5) +##zz +##zz vgpreload_exp_omega_ppc64_aix5_so_SOURCES = $(VGPRELOAD_OMEGA_SOURCES_COMMON) +##zz vgpreload_exp_omega_ppc64_aix5_so_CPPFLAGS = $(AM_CPPFLAGS_PPC64_AIX5) +##zz vgpreload_exp_omega_ppc64_aix5_so_CFLAGS = $(AM_CFLAGS_PPC64_AIX5) $(AM_CFLAGS_PIC) -O2 +##zz vgpreload_exp_omega_ppc64_aix5_so_CCASFLAGS = $(AM_CCASFLAGS_PPC64_AIX5) +##zz vgpreload_exp_omega_ppc64_aix5_so_DEPENDENCIES = $(LIBREPLACEMALLOC_PPC64_AIX5) +##zz vgpreload_exp_omega_ppc64_aix5_so_LDFLAGS = \ +##zz $(PRELOAD_LDFLAGS_PPC64_AIX5) \ +##zz $(LIBREPLACEMALLOC_LDFLAGS_PPC64_AIX5) +##zz +##zz OMEGA_SOURCES_COMMON = \ +##zz o_main.c +##zz +##zz exp_omega_x86_linux_SOURCES = $(OMEGA_SOURCES_COMMON) +##zz exp_omega_x86_linux_CPPFLAGS = $(AM_CPPFLAGS_X86_LINUX) +##zz exp_omega_x86_linux_CFLAGS = $(AM_CFLAGS_X86_LINUX) -O2 +##zz exp_omega_x86_linux_CCASFLAGS = $(AM_CCASFLAGS_X86_LINUX) +##zz exp_omega_x86_linux_DEPENDENCIES = $(COREGRIND_LIBS_X86_LINUX) +##zz exp_omega_x86_linux_LDADD = $(TOOL_LDADD_X86_LINUX) +##zz exp_omega_x86_linux_LDFLAGS = $(TOOL_LDFLAGS_X86_LINUX) +##zz +##zz exp_omega_amd64_linux_SOURCES = $(OMEGA_SOURCES_COMMON) +##zz exp_omega_amd64_linux_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX) +##zz exp_omega_amd64_linux_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) -g -O0 #-O2 +##zz exp_omega_amd64_linux_CCASFLAGS = $(AM_CCASFLAGS_AMD64_LINUX) +##zz exp_omega_amd64_linux_DEPENDENCIES = $(COREGRIND_LIBS_AMD64_LINUX) +##zz exp_omega_amd64_linux_LDADD = $(TOOL_LDADD_AMD64_LINUX) +##zz exp_omega_amd64_linux_LDFLAGS = $(TOOL_LDFLAGS_AMD64_LINUX) +##zz +##zz exp_omega_ppc32_linux_SOURCES = $(OMEGA_SOURCES_COMMON) +##zz exp_omega_ppc32_linux_CPPFLAGS = $(AM_CPPFLAGS_PPC32_LINUX) +##zz exp_omega_ppc32_linux_CFLAGS = $(AM_CFLAGS_PPC32_LINUX) -O2 +##zz exp_omega_ppc32_linux_CCASFLAGS = $(AM_CCASFLAGS_PPC32_LINUX) +##zz exp_omega_ppc32_linux_DEPENDENCIES = $(COREGRIND_LIBS_PPC32_LINUX) +##zz exp_omega_ppc32_linux_LDADD = $(TOOL_LDADD_PPC32_LINUX) +##zz exp_omega_ppc32_linux_LDFLAGS = $(TOOL_LDFLAGS_PPC32_LINUX) +##zz +##zz exp_omega_ppc64_linux_SOURCES = $(OMEGA_SOURCES_COMMON) +##zz exp_omega_ppc64_linux_CPPFLAGS = $(AM_CPPFLAGS_PPC64_LINUX) +##zz exp_omega_ppc64_linux_CFLAGS = $(AM_CFLAGS_PPC64_LINUX) -O2 +##zz exp_omega_ppc64_linux_CCASFLAGS = $(AM_CCASFLAGS_PPC64_LINUX) +##zz exp_omega_ppc64_linux_DEPENDENCIES = $(COREGRIND_LIBS_PPC64_LINUX) +##zz exp_omega_ppc64_linux_LDADD = $(TOOL_LDADD_PPC64_LINUX) +##zz exp_omega_ppc64_linux_LDFLAGS = $(TOOL_LDFLAGS_PPC64_LINUX) +##zz +##zz exp_omega_ppc32_aix5_SOURCES = $(OMEGA_SOURCES_COMMON) +##zz exp_omega_ppc32_aix5_CPPFLAGS = $(AM_CPPFLAGS_PPC32_AIX5) +##zz exp_omega_ppc32_aix5_CFLAGS = $(AM_CFLAGS_PPC32_AIX5) -O2 +##zz exp_omega_ppc32_aix5_CCASFLAGS = $(AM_CCASFLAGS_PPC32_AIX5) +##zz exp_omega_ppc32_aix5_DEPENDENCIES = $(COREGRIND_LIBS_PPC32_AIX5) +##zz exp_omega_ppc32_aix5_LDADD = $(TOOL_LDADD_PPC32_AIX5) +##zz exp_omega_ppc32_aix5_LDFLAGS = $(TOOL_LDFLAGS_PPC32_AIX5) +##zz +##zz exp_omega_ppc64_aix5_SOURCES = $(OMEGA_SOURCES_COMMON) +##zz exp_omega_ppc64_aix5_CPPFLAGS = $(AM_CPPFLAGS_PPC64_AIX5) +##zz exp_omega_ppc64_aix5_CFLAGS = $(AM_CFLAGS_PPC64_AIX5) -O2 +##zz exp_omega_ppc64_aix5_CCASFLAGS = $(AM_CCASFLAGS_PPC64_AIX5) +##zz exp_omega_ppc64_aix5_DEPENDENCIES = $(COREGRIND_LIBS_PPC64_AIX5) +##zz exp_omega_ppc64_aix5_LDADD = $(TOOL_LDADD_PPC64_AIX5) +##zz exp_omega_ppc64_aix5_LDFLAGS = $(TOOL_LDFLAGS_PPC64_AIX5) +##zz +##zz oincludedir = $(includedir)/valgrind +##zz +##zz oinclude_HEADERS = exp-omega.h +##zz +##zz noinst_HEADERS = +##zz +##zz o_replace_memops.o: CFLAGS += -fno-omit-frame-pointer +##zz +##zz o_main.o: CFLAGS += -fno-omit-frame-pointer #-fomit-frame-pointer +##zz diff --git a/exp-omega/docs/Makefile.am b/exp-omega/docs/Makefile.am index 497a7e18f1..eaec1b51f8 100644 --- a/exp-omega/docs/Makefile.am +++ b/exp-omega/docs/Makefile.am @@ -1 +1,5 @@ -EXTRA_DIST = o-manual.xml + +EXTRA_DIST = o-manual.xml omega_introduction.txt + +###--- The original Makefile.am begins here ---### +##zz EXTRA_DIST = o-manual.xml diff --git a/exp-omega/tests/Makefile.am b/exp-omega/tests/Makefile.am index 0cd8338eff..823fe68ba0 100644 --- a/exp-omega/tests/Makefile.am +++ b/exp-omega/tests/Makefile.am @@ -1,27 +1,49 @@ -noinst_SCRIPTS = -#EXTRA_DIST = $(noinst_SCRIPTS) +EXTRA_DIST = block1.c \ + block2.c \ + block3.c \ + overwrite1.c \ + overwrite2.c \ + overwrite3.c \ + overwrite4.c \ + overwrite5.c \ + scope1.c \ + scope2.c \ + scope3.c \ + scope4.cpp \ + scope5.c \ + scope6.c \ + shadow1.c \ + static1.c -check_PROGRAMS = \ - overwrite1 \ - overwrite2 \ - overwrite3 \ - overwrite4 \ - overwrite5 \ - scope1 \ - scope2 \ - scope3 \ - scope4 \ - scope5 \ - scope6 \ - block1 \ - block2 \ - block3 \ - shadow1 \ - static1 -AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O0 -g -AM_CXXFLAGS = $(AM_CFLAGS) -Wall -O0 -g - -# C++ tests -scope4_SOURCES = scope4.cpp +###--- The original Makefile.am begins here ---### +##zz +##zz noinst_SCRIPTS = +##zz +##zz #EXTRA_DIST = $(noinst_SCRIPTS) +##zz +##zz check_PROGRAMS = \ +##zz overwrite1 \ +##zz overwrite2 \ +##zz overwrite3 \ +##zz overwrite4 \ +##zz overwrite5 \ +##zz scope1 \ +##zz scope2 \ +##zz scope3 \ +##zz scope4 \ +##zz scope5 \ +##zz scope6 \ +##zz block1 \ +##zz block2 \ +##zz block3 \ +##zz shadow1 \ +##zz static1 +##zz +##zz AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O0 -g +##zz AM_CXXFLAGS = $(AM_CFLAGS) -Wall -O0 -g +##zz +##zz # C++ tests +##zz scope4_SOURCES = scope4.cpp +##zz