From: Nicholas Nethercote Date: Fri, 6 Feb 2009 03:46:50 +0000 (+0000) Subject: Index: Makefile.core.am X-Git-Tag: svn/VALGRIND_3_5_0~1020 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7c930e4eb4249161adaccc129262882315612439;p=thirdparty%2Fvalgrind.git Index: Makefile.core.am Factor out some includes. Remove some unnecessary includes. Index: configure.in Improve some comments. Make the arch/platform/OS output more consistent and comprehensive. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9108 --- diff --git a/Makefile.core.am b/Makefile.core.am index a0a46463d9..4479463294 100644 --- a/Makefile.core.am +++ b/Makefile.core.am @@ -1,70 +1,39 @@ -add_includes_x86_linux = -I$(top_srcdir)/coregrind \ - -I$(top_srcdir) \ - -I$(top_srcdir)/coregrind/x86 \ - -I$(top_srcdir)/coregrind/linux \ - -I$(top_srcdir)/coregrind/x86-linux \ +add_includes_COMMON = \ + -I$(top_srcdir)/coregrind \ -I$(top_srcdir)/include \ - -I@VEX_DIR@/pub \ + -I@VEX_DIR@/pub + +add_includes_x86_linux = $(add_includes_COMMON) \ -DVG_PLATFORM="\"x86-linux\"" \ -DVGA_x86=1 \ -DVGO_linux=1 \ -DVGP_x86_linux=1 -add_includes_amd64_linux = -I$(top_srcdir)/coregrind \ - -I$(top_srcdir) \ - -I$(top_srcdir)/coregrind/amd64 \ - -I$(top_srcdir)/coregrind/linux \ - -I$(top_srcdir)/coregrind/amd64-linux \ - -I$(top_srcdir)/include \ - -I@VEX_DIR@/pub \ +add_includes_amd64_linux = $(add_includes_COMMON) \ -DVG_PLATFORM="\"amd64-linux\"" \ -DVGA_amd64=1 \ -DVGO_linux=1 \ -DVGP_amd64_linux=1 -add_includes_ppc32_linux = -I$(top_srcdir)/coregrind \ - -I$(top_srcdir) \ - -I$(top_srcdir)/coregrind/ppc32 \ - -I$(top_srcdir)/coregrind/linux \ - -I$(top_srcdir)/coregrind/ppc32-linux \ - -I$(top_srcdir)/include \ - -I@VEX_DIR@/pub \ +add_includes_ppc32_linux = $(add_includes_COMMON) \ -DVG_PLATFORM="\"ppc32-linux\"" \ -DVGA_ppc32=1 \ -DVGO_linux=1 \ -DVGP_ppc32_linux=1 -add_includes_ppc64_linux = -I$(top_srcdir)/coregrind \ - -I$(top_srcdir) \ - -I$(top_srcdir)/coregrind/ppc64 \ - -I$(top_srcdir)/coregrind/linux \ - -I$(top_srcdir)/coregrind/ppc64-linux \ - -I$(top_srcdir)/include \ - -I@VEX_DIR@/pub \ +add_includes_ppc64_linux = $(add_includes_COMMON) \ -DVG_PLATFORM="\"ppc64-linux\"" \ -DVGA_ppc64=1 \ -DVGO_linux=1 \ -DVGP_ppc64_linux=1 -add_includes_ppc32_aix5 = -I$(top_srcdir)/coregrind \ - -I$(top_srcdir) \ - -I$(top_srcdir)/coregrind/ppc32 \ - -I$(top_srcdir)/coregrind/aix5 \ - -I$(top_srcdir)/coregrind/ppc32-aix5 \ - -I$(top_srcdir)/include \ - -I@VEX_DIR@/pub \ +add_includes_ppc32_aix5 = $(add_includes_COMMON) \ -DVG_PLATFORM="\"ppc32-aix5\"" \ -DVGA_ppc32=1 \ -DVGO_aix5=1 \ -DVGP_ppc32_aix5=1 -add_includes_ppc64_aix5 = -I$(top_srcdir)/coregrind \ - -I$(top_srcdir) \ - -I$(top_srcdir)/coregrind/ppc64 \ - -I$(top_srcdir)/coregrind/aix5 \ - -I$(top_srcdir)/coregrind/ppc64-aix5 \ - -I$(top_srcdir)/include \ - -I@VEX_DIR@/pub \ +add_includes_ppc64_aix5 = $(add_includes_COMMON) \ -DVG_PLATFORM="\"ppc64-aix5\"" \ -DVGA_ppc64=1 \ -DVGO_aix5=1 \ diff --git a/configure.in b/configure.in index 15aabb1ae0..1e7d33d28a 100644 --- a/configure.in +++ b/configure.in @@ -214,8 +214,9 @@ fi #---------------------------------------------------------------------------- -# VGCONF_OS is the primary build OS. It is passed in to compilation of many -# C files via -VGO_$(VGCONF_OS) and -VGP_$(VGCONF_ARCH_PRI)_$(VGCONF_OS). +# VGCONF_OS is the primary build OS, eg. "linux". It is passed in to +# compilation of many C files via -VGO_$(VGCONF_OS) and +# -VGP_$(VGCONF_ARCH_PRI)_$(VGCONF_OS). AC_MSG_CHECKING([for a supported OS]) AC_SUBST(VGCONF_OS) @@ -302,22 +303,23 @@ fi #---------------------------------------------------------------------------- -# VGCONF_ARCH_PRI is the arch for the primary build target. By default it's -# the same as ARCH_MAX. But if, say, we do a build on an amd64 machine, but -# --enable-only32bit has been requested, then ARCH_MAX (see above) will be -# "amd64" since that reflects the most that this cpu can do, but -# VGCONF_ARCH_PRI will be downgraded to "x86", since that reflects the arch -# corresponding to the primary build (VGCONF_PLATFORM_PRI_CAPS). It is +# VGCONF_ARCH_PRI is the arch for the primary build target, eg. "amd64". By +# default it's the same as ARCH_MAX. But if, say, we do a build on an amd64 +# machine, but --enable-only32bit has been requested, then ARCH_MAX (see +# above) will be "amd64" since that reflects the most that this cpu can do, +# but VGCONF_ARCH_PRI will be downgraded to "x86", since that reflects the +# arch corresponding to the primary build (VGCONF_PLATFORM_PRI_CAPS). It is # passed in to compilation of many C files via -VGA_$(VGCONF_ARCH_PRI) and # -VGP_$(VGCONF_ARCH_PRI)_$(VGCONF_OS). AC_SUBST(VGCONF_ARCH_PRI) -# VGCONF_PLATFORM_PRI_CAPS is the primary build target. The entire system, -# including regression and performance tests, will be built for this target. -# The "_CAPS" indicates that the name is in capital letters, because it's +# VGCONF_PLATFORM_PRI_CAPS is the primary build target, eg. "AMD64_LINUX". +# The entire system, including regression and performance tests, will be +# built for this target. The "_CAPS" indicates that the name is in capital +# letters, and it also uses '_' rather than '-' as a separator, because it's # used to create various Makefile variables, which are all in caps by -# convention. This is in contrast to VGCONF_ARCH_PRI and VGCONF_OS which -# are not in caps. +# convention and cannot contain '-' characters. This is in contrast to +# VGCONF_ARCH_PRI and VGCONF_OS which are not in caps. AC_SUBST(VGCONF_PLATFORM_PRI_CAPS) # VGCONF_PLATFORM_SEC_CAPS is the secondary build target, if there is one. @@ -1763,9 +1765,9 @@ AC_OUTPUT( cat<