[cig-commits] r6854 - mc/3D/CitcomS/trunk/bin
leif at geodynamics.org
leif at geodynamics.org
Fri May 11 13:19:28 PDT 2007
Author: leif
Date: 2007-05-11 13:19:28 -0700 (Fri, 11 May 2007)
New Revision: 6854
Modified:
mc/3D/CitcomS/trunk/bin/Makefile.am
Log:
Fixed LINK problem w/Automake.
Modified: mc/3D/CitcomS/trunk/bin/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/bin/Makefile.am 2007-05-11 17:47:18 UTC (rev 6853)
+++ mc/3D/CitcomS/trunk/bin/Makefile.am 2007-05-11 20:19:28 UTC (rev 6854)
@@ -40,7 +40,7 @@
bin_PROGRAMS += pycitcoms mpipycitcoms
endif
if COND_EXCHANGER
- LINK = $(CXXLINK)
+ PYLINK = $(CXXLINK)
bin_SCRIPTS += coupledcitcoms
MAYBE_WITH_EXCHANGER = -DWITH_EXCHANGER
if COND_EMBEDDING
@@ -49,6 +49,7 @@
MAYBE_EXCHANGER_MODULE = $(top_builddir)/module/Exchanger/ExchangerLibmodule.la
endif
else
+ PYLINK = $(LINK)
MAYBE_WITH_EXCHANGER =
MAYBE_EXCHANGER_MODULE =
endif
@@ -131,7 +132,7 @@
$(libCitcomS)
pycitcoms$(EXEEXT): $(pycitcoms_OBJECTS) $(pycitcoms_DEPENDENCIES)
@rm -f pycitcoms$(EXEEXT)
- $(LINK) $(PYTHON_LDFLAGS) $(PYTHON_LINKFORSHARED) \
+ $(PYLINK) $(PYTHON_LDFLAGS) $(PYTHON_LINKFORSHARED) \
$(pycitcoms_LDFLAGS) $(pycitcoms_OBJECTS) $(pycitcoms_LDADD) \
$(PYTHON_EGG_LDFLAGS) \
$(PYTHON_BLDLIBRARY) \
@@ -149,7 +150,7 @@
$(libCitcomS)
mpipycitcoms$(EXEEXT): $(mpipycitcoms_OBJECTS) $(mpipycitcoms_DEPENDENCIES)
@rm -f mpipycitcoms$(EXEEXT)
- $(LINK) $(PYTHON_LDFLAGS) $(PYTHON_LINKFORSHARED) \
+ $(PYLINK) $(PYTHON_LDFLAGS) $(PYTHON_LINKFORSHARED) \
$(mpipycitcoms_LDFLAGS) $(mpipycitcoms_OBJECTS) $(mpipycitcoms_LDADD) \
$(PYTHON_EGG_LDFLAGS) \
$(PYTHON_BLDLIBRARY) \
More information about the cig-commits
mailing list