|
From: <sv...@va...> - 2009-06-13 01:23:00
|
Author: njn Date: 2009-06-13 02:22:29 +0100 (Sat, 13 Jun 2009) New Revision: 10317 Log: Some simplifications for auxprogs/Makefile.am. Modified: branches/BUILD_TWEAKS/auxprogs/Makefile.am Modified: branches/BUILD_TWEAKS/auxprogs/Makefile.am =================================================================== --- branches/BUILD_TWEAKS/auxprogs/Makefile.am 2009-06-13 01:08:38 UTC (rev 10316) +++ branches/BUILD_TWEAKS/auxprogs/Makefile.am 2009-06-13 01:22:29 UTC (rev 10317) @@ -75,12 +75,8 @@ ## First, we have to say how to build the .so's .. ## noinst_PROGRAMS = -noinst_DSYMS = if BUILD_MPIWRAP_PRI noinst_PROGRAMS += libmpiwrap-@VGCONF_ARCH_PRI@-@VGCONF_OS@.so -if VGCONF_OS_IS_DARWIN -noinst_DSYMS += libmpiwrap-@VGCONF_ARCH_PRI@-@VGCONF_OS@.so -endif libmpiwrap-@VGCONF_ARCH_PRI@-@VGCONF_OS@.so: libmpiwrap.c $(MPI_CC) $(HACKY_FLAGS_PRI) \ -I../include \ @@ -88,15 +84,16 @@ endif if BUILD_MPIWRAP_SEC noinst_PROGRAMS += libmpiwrap-@VGCONF_ARCH_SEC@-@VGCONF_OS@.so -if VGCONF_OS_IS_DARWIN -noinst_DSYMS += libmpiwrap-@VGCONF_ARCH_SEC@-@VGCONF_OS@.so -endif libmpiwrap-@VGCONF_ARCH_SEC@-@VGCONF_OS@.so: libmpiwrap.c $(MPI_CC) $(HACKY_FLAGS_SEC) \ -I../include \ -o libmpiwrap-@VGCONF_ARCH_SEC@-@VGCONF_OS@.so libmpiwrap.c endif +if VGCONF_OS_IS_DARWIN +noinst_DSYMS = $(noinst_PROGRAMS) +endif + ## 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. @@ -104,14 +101,9 @@ #nodist_SOURCES = libmpiwrap-@VGCONF_ARCH_PRI@-@VGCONF_OS@.c #nodist_SOURCES = libmpiwrap-@VGCONF_ARCH_SEC@-@VGCONF_OS@.c -libmpiwrap-.c: - rm -f libmpiwrap-.c - touch libmpiwrap-.c - libmpiwrap-@VGCONF_ARCH_PRI@-@VGCONF_OS@.c: rm -f libmpiwrap-@VGCONF_ARCH_PRI@-@VGCONF_OS@.c touch libmpiwrap-@VGCONF_ARCH_PRI@-@VGCONF_OS@.c - if VGCONF_HAVE_PLATFORM_SEC libmpiwrap-@VGCONF_ARCH_SEC@-@VGCONF_OS@.c: rm -f libmpiwrap-@VGCONF_ARCH_SEC@-@VGCONF_OS@.c |