|
From: <sv...@va...> - 2009-02-06 23:27:20
|
Author: njn
Date: 2009-02-06 23:27:16 +0000 (Fri, 06 Feb 2009)
New Revision: 9121
Log:
Merged r9120 (Merge Makefile.{inplace,install}.am, and simplify installation
of libmpiwrap.so) from trunk.
Removed:
trunk/Makefile.inplace.am
Modified:
trunk/Makefile.install.am
trunk/Makefile.tool.am
trunk/auxprogs/Makefile.am
trunk/coregrind/Makefile.am
Deleted: trunk/Makefile.inplace.am
===================================================================
--- trunk/Makefile.inplace.am 2009-02-06 23:24:10 UTC (rev 9120)
+++ trunk/Makefile.inplace.am 2009-02-06 23:27:16 UTC (rev 9121)
@@ -1,16 +0,0 @@
-# This is used by coregrind/Makefile.am and Makefile.tool.am for doing
-# "in-place" installs. It copies $(noinst_PROGRAMS) into $inplacedir, doing
-# some magic renaming as it does.
-# There is similar code in Makefile.install.am (which describes how the
-# magic sed commands work).
-
-all-local:
- if [ -n "$(noinst_PROGRAMS)" ] ; then \
- for f in $(noinst_PROGRAMS); do \
- name=`echo $$f | sed -e 's/-\([^-]*-[^-.]*\)\(\..*\)\?$$/\2/'`; \
- plat=`echo $$f | sed -e 's/^.*-\([^-]*-[^-.]*\)\(\..*\)\?$$/\1/'`; \
- mkdir -p $(inplacedir)/$$plat; \
- rm -f $(inplacedir)/$$plat/$$name; \
- ln -f -s ../../$(subdir)/$$f $(inplacedir)/$$plat/$$name; \
- done ; \
- fi
Modified: trunk/Makefile.install.am
===================================================================
--- trunk/Makefile.install.am 2009-02-06 23:24:10 UTC (rev 9120)
+++ trunk/Makefile.install.am 2009-02-06 23:27:16 UTC (rev 9121)
@@ -1,3 +1,18 @@
+# This is used by coregrind/Makefile.am and Makefile.tool.am for doing
+# "in-place" installs. It copies $(noinst_PROGRAMS) into $inplacedir, doing
+# some magic renaming as it does.
+# The similar code below explains how the magic sed commands work.
+all-local:
+ if [ -n "$(noinst_PROGRAMS)" ] ; then \
+ for f in $(noinst_PROGRAMS); do \
+ name=`echo $$f | sed -e 's/-\([^-]*-[^-.]*\)\(\..*\)\{0,1\}$$/\2/'`; \
+ plat=`echo $$f | sed -e 's/^.*-\([^-]*-[^-.]*\)\(\..*\)\{0,1\}$$/\1/'`; \
+ mkdir -p $(inplacedir)/$$plat; \
+ rm -f $(inplacedir)/$$plat/$$name; \
+ ln -f -s ../../$(subdir)/$$f $(inplacedir)/$$plat/$$name; \
+ done ; \
+ fi
+
# This is used by coregrind/Makefile.am and by <tool>/Makefile.am for doing
# "make install". It copies $(noinst_PROGRAMS) into $prefix/lib/valgrind/,
# doing some magic renaming as it does.
@@ -2,3 +17,2 @@
# It needs to be depended on by an 'install-exec-local' rule.
-# There is similar code in Makefile.inplace.am.
#
@@ -14,7 +28,6 @@
# and not in
# $prefix/lib/valgrind/omega-x86-linux/exp
# or similarly mutant place.
-
install-exec-local-programs:
if [ -n "$(noinst_PROGRAMS)" ] ; then \
for f in $(noinst_PROGRAMS); do \
Modified: trunk/Makefile.tool.am
===================================================================
--- trunk/Makefile.tool.am 2009-02-06 23:24:10 UTC (rev 9120)
+++ trunk/Makefile.tool.am 2009-02-06 23:27:16 UTC (rev 9121)
@@ -3,7 +3,6 @@
include $(top_srcdir)/Makefile.all.am
include $(top_srcdir)/Makefile.flags.am
-include $(top_srcdir)/Makefile.inplace.am
include $(top_srcdir)/Makefile.install.am
Modified: trunk/auxprogs/Makefile.am
===================================================================
--- trunk/auxprogs/Makefile.am 2009-02-06 23:24:10 UTC (rev 9120)
+++ trunk/auxprogs/Makefile.am 2009-02-06 23:27:16 UTC (rev 9121)
@@ -62,18 +62,18 @@
##
noinst_PROGRAMS =
if BUILD_MPIWRAP_PRI
-noinst_PROGRAMS += libmpiwrap-@VGCONF_PLATFORM_PRI_CAPS@.so
-libmpiwrap-@VGCONF_PLATFORM_PRI_CAPS@.so: libmpiwrap.c
+noinst_PROGRAMS += libmpiwrap-@VGCONF_ARCH_PRI@-@VGCONF_OS@.so
+libmpiwrap-@VGCONF_ARCH_PRI@-@VGCONF_OS@.so: libmpiwrap.c
$(MPI_CC) $(HACKY_FLAGS_PRI) \
-I../include \
- -o libmpiwrap-@VGCONF_PLATFORM_PRI_CAPS@.so libmpiwrap.c
+ -o libmpiwrap-@VGCONF_ARCH_PRI@-@VGCONF_OS@.so libmpiwrap.c
endif
if BUILD_MPIWRAP_SEC
-noinst_PROGRAMS += libmpiwrap-@VGCONF_PLATFORM_SEC_CAPS@.so
-libmpiwrap-@VGCONF_PLATFORM_SEC_CAPS@.so: libmpiwrap.c
+noinst_PROGRAMS += libmpiwrap-@VGCONF_ARCH_SEC@-@VGCONF_OS@.so
+libmpiwrap-@VGCONF_ARCH_SEC@-@VGCONF_OS@.so: libmpiwrap.c
$(MPI_CC) $(HACKY_FLAGS_SEC) \
-I../include \
- -o libmpiwrap-@VGCONF_PLATFORM_SEC_CAPS@.so libmpiwrap.c
+ -o libmpiwrap-@VGCONF_ARCH_SEC@-@VGCONF_OS@.so libmpiwrap.c
endif
@@ -85,24 +85,12 @@
install-exec-local:
if BUILD_MPIWRAP_PRI
-# convert (eg) X86_LINUX to x86-linux
-# really should use sed here, rather than assume tr is available
- pD=`echo @VGCONF_PLATFORM_PRI_CAPS@ | tr A-Z_ a-z-` ; \
- $(mkinstalldirs) $(DESTDIR)$(valdir)/$$pD; \
- rm -f ./libmpiwrap.so; \
- cp ./libmpiwrap-@VGCONF_PLATFORM_PRI_CAPS@.so ./libmpiwrap.so; \
- $(INSTALL_PROGRAM) ./libmpiwrap.so \
- $(DESTDIR)$(valdir)/$$pD; \
- rm -f ./libmpiwrap.so
+ $(mkinstalldirs) $(DESTDIR)$(valdir)/@VGCONF_ARCH_PRI@-@VGCONF_OS@; \
+ $(INSTALL_PROGRAM) ./libmpiwrap-@VGCONF_ARCH_PRI@-@VGCONF_OS@.so $(DESTDIR)$(valdir)/@VGCONF_ARCH_PRI@-@VGCONF_OS@/libmpiwrap.so;
endif
if BUILD_MPIWRAP_SEC
- pD=`echo @VGCONF_PLATFORM_SEC_CAPS@ | tr A-Z_ a-z-` ; \
- $(mkinstalldirs) $(DESTDIR)$(valdir)/$$pD; \
- rm -f ./libmpiwrap.so; \
- cp ./libmpiwrap-@VGCONF_PLATFORM_SEC_CAPS@.so ./libmpiwrap.so; \
- $(INSTALL_PROGRAM) ./libmpiwrap.so \
- $(DESTDIR)$(valdir)/$$pD; \
- rm -f ./libmpiwrap.so
+ $(mkinstalldirs) $(DESTDIR)$(valdir)/@VGCONF_ARCH_PRI@-@VGCONF_OS@; \
+ $(INSTALL_PROGRAM) ./libmpiwrap-@VGCONF_ARCH_SEC@-@VGCONF_OS@.so $(DESTDIR)$(valdir)/@VGCONF_ARCH_SEC@-@VGCONF_OS@/libmpiwrap.so;
endif
@@ -110,28 +98,28 @@
## It would seem that using nodist_SOURCES is the right fix, but
## I can't figure out how to do it.
##
-#nodist_SOURCES = libmpiwrap-@VGCONF_PLATFORM_PRI_CAPS@.c
-#nodist_SOURCES = libmpiwrap-@VGCONF_PLATFORM_SEC_CAPS@.c
+#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_PLATFORM_PRI_CAPS@.c:
- rm -f libmpiwrap-@VGCONF_PLATFORM_PRI_CAPS@.c
- touch libmpiwrap-@VGCONF_PLATFORM_PRI_CAPS@.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_CAPS
-libmpiwrap-@VGCONF_PLATFORM_SEC_CAPS@.c:
- rm -f libmpiwrap-@VGCONF_PLATFORM_SEC_CAPS@.c
- touch libmpiwrap-@VGCONF_PLATFORM_SEC_CAPS@.c
+libmpiwrap-@VGCONF_ARCH_SEC@-@VGCONF_OS@.c:
+ rm -f libmpiwrap-@VGCONF_ARCH_SEC@-@VGCONF_OS@.c
+ touch libmpiwrap-@VGCONF_ARCH_SEC@-@VGCONF_OS@.c
endif
## cleanery
clean-local:
rm -f libmpiwrap-.c \
- libmpiwrap-@VGCONF_PLATFORM_PRI_CAPS@.c \
- libmpiwrap-@VGCONF_PLATFORM_SEC_CAPS@.c
+ libmpiwrap-@VGCONF_ARCH_PRI@-@VGCONF_OS@.c \
+ libmpiwrap-@VGCONF_ARCH_SEC@-@VGCONF_OS@.c
#
#----------------------------------------------------------
Modified: trunk/coregrind/Makefile.am
===================================================================
--- trunk/coregrind/Makefile.am 2009-02-06 23:24:10 UTC (rev 9120)
+++ trunk/coregrind/Makefile.am 2009-02-06 23:27:16 UTC (rev 9121)
@@ -5,7 +5,6 @@
include $(top_srcdir)/Makefile.all.am
include $(top_srcdir)/Makefile.flags.am
-include $(top_srcdir)/Makefile.inplace.am
include $(top_srcdir)/Makefile.install.am
|