|
From: <sv...@va...> - 2009-06-13 01:09:01
|
Author: njn Date: 2009-06-13 02:08:38 +0100 (Sat, 13 Jun 2009) New Revision: 10316 Log: More clean-up. Modified: branches/BUILD_TWEAKS/auxprogs/Makefile.am branches/BUILD_TWEAKS/cachegrind/Makefile.am Modified: branches/BUILD_TWEAKS/auxprogs/Makefile.am =================================================================== --- branches/BUILD_TWEAKS/auxprogs/Makefile.am 2009-06-13 00:50:38 UTC (rev 10315) +++ branches/BUILD_TWEAKS/auxprogs/Makefile.am 2009-06-13 01:08:38 UTC (rev 10316) @@ -2,36 +2,43 @@ include $(top_srcdir)/Makefile.flags.am include $(top_srcdir)/Makefile.core-tool.am -bin_PROGRAMS = valgrind-listener +noinst_SCRIPTS = \ + gen-mdg \ + gsl16test \ + gsl19test \ + posixtestsuite-1.5.1-diff-results -noinst_SCRIPTS = gen-mdg DotToScc.hs Merge3Way.hs primes.c \ - gsl16test gsl16-badfree.patch gsl16-wavelet.patch \ - gsl19test \ - ppcfround.c ppc64shifts.c libmpiwrap.c mpiwrap_type_test.c \ - aix5_VKI_info.c libmpiwrap_aix5.exp \ - aix5_proc_self_sysent.c \ - posixtestsuite-1.5.1-diff-results \ - posixtestsuite-1.5.1-diff.txt +EXTRA_DIST = $(noinst_SCRIPTS) \ + DotToScc.hs \ + Merge3Way.hs \ + aix5_VKI_info.c \ + aix5_proc_self_sysent.c \ + gsl16-badfree.patch \ + gsl16-wavelet.patch \ + libmpiwrap.c \ + libmpiwrap_aix5.exp \ + mpiwrap_type_test.c \ + posixtestsuite-1.5.1-diff.txt \ + ppcfround.c \ + ppc64shifts.c \ + primes.c -EXTRA_DIST = $(noinst_SCRIPTS) +#---------------------------------------------------------------------------- +# valgrind_listener (built for the primary target only) +#---------------------------------------------------------------------------- +bin_PROGRAMS = valgrind-listener -#------------------------- listener ----------------------- -# Build valgrind_listener for the primary target only. -# valgrind_listener_SOURCES = valgrind-listener.c - valgrind_listener_CPPFLAGS = $(AM_CPPFLAGS_PRI) -I$(top_srcdir)/coregrind valgrind_listener_CFLAGS = $(AM_CFLAGS_PRI) valgrind_listener_CCASFLAGS = $(AM_CCASFLAGS_PRI) valgrind_listener_LDFLAGS = $(AM_CFLAGS_PRI) -# -#---------------------------------------------------------- -#------------------------- mpi wrappers ----------------------- -# Build libmpiwrap.so for the primary target, and for the secondary -# target if relevant. -# +#---------------------------------------------------------------------------- +# libmpiwrap-<platform>.so +#---------------------------------------------------------------------------- + # This is really horrible. # # automake isn't good at supporting non-$(CC) compilers. @@ -42,7 +49,7 @@ # XXX: if we put the MPI stuff in its own directory and manually added # "CC = $(MPI_CC)" then I think the usual automake approach would work. # --njn -# + if VGCONF_OS_IS_AIX5 HACKY_FLAGS_PRI = -g -O -bE:libmpiwrap_aix5.exp -bM:SRE -bnoentry \ -qflag=w:w -qlanglvl=extended \ @@ -90,18 +97,6 @@ -o libmpiwrap-@VGCONF_ARCH_SEC@-@VGCONF_OS@.so libmpiwrap.c endif - -## And here we say how to install them. -## -# The following install hack is serialised by "libmpiwrap.so". -# Hence force -j 1. -.NOTPARALLEL: - -clean-local: clean-noinst_DSYMS - -install-exec-local: install-noinst_PROGRAMS install-noinst_DSYMS - - ## And some hacks to keep 'make dist' happy. ## It would seem that using nodist_SOURCES is the right fix, but ## I can't figure out how to do it. @@ -123,6 +118,20 @@ touch libmpiwrap-@VGCONF_ARCH_SEC@-@VGCONF_OS@.c endif + +#---------------------------------------------------------------------------- +# General stuff +#---------------------------------------------------------------------------- + +# The following install hack is serialised by "libmpiwrap.so". +# Hence force -j 1. [XXX: I don't understand that comment. --njn] +.NOTPARALLEL: + +clean-local: clean-noinst_DSYMS + +install-exec-local: install-noinst_PROGRAMS install-noinst_DSYMS + + # #---------------------------------------------------------- Modified: branches/BUILD_TWEAKS/cachegrind/Makefile.am =================================================================== --- branches/BUILD_TWEAKS/cachegrind/Makefile.am 2009-06-13 00:50:38 UTC (rev 10315) +++ branches/BUILD_TWEAKS/cachegrind/Makefile.am 2009-06-13 01:08:38 UTC (rev 10316) @@ -1,5 +1,9 @@ include $(top_srcdir)/Makefile.tool.am +#---------------------------------------------------------------------------- +# Headers, etc +#---------------------------------------------------------------------------- + bin_SCRIPTS = cg_annotate noinst_HEADERS = \ @@ -8,11 +12,11 @@ cg_sim.c #---------------------------------------------------------------------------- -# cg_merge +# cg_merge (built for the primary target only) #---------------------------------------------------------------------------- -# Build cg_merge for the primary target only. bin_PROGRAMS = cg_merge + cg_merge_SOURCES = cg_merge.c cg_merge_CPPFLAGS = $(AM_CPPFLAGS_PRI) cg_merge_CFLAGS = $(AM_CFLAGS_PRI) |