[cig-commits] [commit] master, python-removal, rajesh-petsc-schur: Removed Pyre and Exchanger related checks from all Makefile.am files (369667f)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Nov 5 19:03:05 PST 2014
Repository : https://github.com/geodynamics/citcoms
On branches: master,python-removal,rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd
>---------------------------------------------------------------
commit 369667f2ddf4121d3fd0dc29872ff0df1244db39
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Wed Aug 20 16:06:53 2014 -0700
Removed Pyre and Exchanger related checks from all Makefile.am files
>---------------------------------------------------------------
369667f2ddf4121d3fd0dc29872ff0df1244db39
Makefile.am | 19 +---------
bin/Makefile.am | 111 --------------------------------------------------------
etc/Makefile.am | 9 -----
lib/Makefile.am | 15 --------
4 files changed, 1 insertion(+), 153 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index ef25ad6..a65720c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,23 +26,6 @@
ACLOCAL_AMFLAGS = -I m4
-if COND_PYRE
- MAYBE_PYRE = CitcomS etc examples module tests visual
-endif
-
-SUBDIRS = lib $(MAYBE_PYRE) bin
-
-EXTRA_DIST = \
- setup.py \
- archimedes/__init__.py
-
-if COND_PYRE
-install-data-hook:
- top_builddir=`$(am__cd) $(top_builddir) && pwd` && \
- cd $(top_srcdir) && \
- $(PYTHON) setup.py install_deps -H None -f $$top_builddir/deps --prefix=$(prefix) && \
- $(PYTHON) setup.py egg_info -e $(pythondir)
-endif
-
+SUBDIRS = lib bin
## end of Makefile.am
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 3f54730..2055e20 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -33,31 +33,6 @@ endif
bin_PROGRAMS = CitcomSFull CitcomSRegional
-if COND_PYRE
- bin_SCRIPTS = citcoms
-
-if COND_EMBEDDING
- bin_PROGRAMS += pycitcoms mpipycitcoms
-endif
-if COND_EXCHANGER
- PYLINK = $(CXXLINK)
- MAYBE_WITH_EXCHANGER = -DWITH_EXCHANGER
-if COND_EMBEDDING
- MAYBE_EXCHANGER_MODULE = $(top_builddir)/module/Exchanger/libExchangerLibmodule.a
-else
- MAYBE_EXCHANGER_MODULE = $(top_builddir)/module/Exchanger/ExchangerLibmodule.la
-endif
-else
- PYLINK = $(LINK)
- MAYBE_WITH_EXCHANGER =
- MAYBE_EXCHANGER_MODULE =
-endif
-else
-
- bin_SCRIPTS =
-endif
-
-
######## legacy drivers ########
@@ -66,93 +41,7 @@ CitcomSFull_LDADD = $(libCitcomS)
CitcomSRegional_SOURCES = Citcom.c CitcomSRegional.c
CitcomSRegional_LDADD = $(libCitcomS)
-
-
-######## pyrized driver ########
-
-
abs_top_builddir = @abs_top_builddir@
abs_builddir = @abs_builddir@
-
-if COND_EMBEDDING
- INTERPRETER = $(bindir)/pycitcoms
- noinstINTERPRETER = $(abs_builddir)/pycitcoms
- noinstPYTHONPATH = $(abs_top_builddir)/python
- libCitcomS = $(top_builddir)/lib/libCitcomS.a
-else
- INTERPRETER = $(PYTHON)
- noinstINTERPRETER = $(PYTHON)
- noinstPYTHONPATH = $(abs_top_builddir)/python:$(abs_top_builddir)/module/.libs
- libCitcomS = $(top_builddir)/lib/libCitcomS.la
-endif
-
-if COND_PYRE
-INCLUDES += \
- -I$(top_srcdir)/module \
- -I$(top_srcdir)/module/Exchanger \
- $(PYTHON_EGG_CPPFLAGS) \
- -I$(PYTHON_INCDIR)
-endif
-
-
-# citcoms (top-level Python script)
-do_build = sed -e s%[@]INTERPRETER[@]%$(noinstINTERPRETER)%g -e s%[@]PYTHONPATH[@]%$(noinstPYTHONPATH)%g
-do_install = sed -e s%[@]INTERPRETER[@]%$(INTERPRETER)%g -e s%[@]PYTHONPATH[@]%$(PYTHONPATH)%g
-citcoms: $(srcdir)/citcoms.in Makefile
- $(do_build) < $(srcdir)/citcoms.in > $@ || (rm -f $@ && exit 1)
- chmod +x $@
-install-binSCRIPTS: $(bin_SCRIPTS)
- @$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
- @list='$(bin_SCRIPTS)'; for p in $$list; do \
- if test -f "$$p.in"; then d=; else d="$(srcdir)/"; fi; \
- if test -f $$d$$p.in; then \
- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
- echo " $(do_install) '$$d$$p.in' > '$(DESTDIR)$(bindir)/$$f'"; \
- $(do_install) "$$d$$p.in" > "$(DESTDIR)$(bindir)/$$f"; \
- echo " chmod +x '$(DESTDIR)$(bindir)/$$f'"; \
- chmod +x "$(DESTDIR)$(bindir)/$$f"; \
- else :; fi; \
- done
-EXTRA_DIST = citcoms.in
-CLEANFILES = $(bin_SCRIPTS)
-
-
-# pycitcoms (libCitcomS + CitcomSLibmodule + embedded Python interpreter)
-pycitcoms_SOURCES = pycitcoms.c dummy.cc
-pycitcoms_CFLAGS = $(MAYBE_WITH_EXCHANGER)
-pycitcoms_LDADD = \
- $(top_builddir)/module/libCitcomSLibmodule.a \
- $(MAYBE_EXCHANGER_MODULE) \
- $(libCitcomS)
-pycitcoms$(EXEEXT): $(pycitcoms_OBJECTS) $(pycitcoms_DEPENDENCIES)
- @rm -f pycitcoms$(EXEEXT)
- $(PYLINK) $(PYTHON_LDFLAGS) $(PYTHON_LINKFORSHARED) \
- $(pycitcoms_LDFLAGS) $(pycitcoms_OBJECTS) $(pycitcoms_LDADD) \
- $(PYTHON_EGG_LDFLAGS) \
- $(PYTHON_BLDLIBRARY) \
- $(PYTHON_LIBS) $(PYTHON_MODLIBS) $(PYTHON_SYSLIBS) \
- $(LIBS) \
- $(PYTHON_LDLAST)
-
-
-# pycitcoms (libCitcomS + CitcomSLibmodule + embedded Python interpreter)
-mpipycitcoms_SOURCES = pycitcoms.c dummy.cc
-mpipycitcoms_CFLAGS = -DUSE_MPI $(MAYBE_WITH_EXCHANGER)
-mpipycitcoms_LDADD = \
- $(top_builddir)/module/libCitcomSLibmodule.a \
- $(MAYBE_EXCHANGER_MODULE) \
- $(libCitcomS)
-mpipycitcoms$(EXEEXT): $(mpipycitcoms_OBJECTS) $(mpipycitcoms_DEPENDENCIES)
- @rm -f mpipycitcoms$(EXEEXT)
- $(PYLINK) $(PYTHON_LDFLAGS) $(PYTHON_LINKFORSHARED) \
- $(mpipycitcoms_LDFLAGS) $(mpipycitcoms_OBJECTS) $(mpipycitcoms_LDADD) \
- $(PYTHON_EGG_LDFLAGS) \
- $(PYTHON_BLDLIBRARY) \
- $(PYTHON_LIBS) $(PYTHON_MODLIBS) $(PYTHON_SYSLIBS) \
- $(LIBS) \
- $(PYTHON_LDLAST)
-
-
## end of Makefile.am
diff --git a/etc/Makefile.am b/etc/Makefile.am
index 8a57f1e..5962819 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -23,14 +23,5 @@
# $Id$
-dist_pkgsysconf_DATA = \
- full.odb \
- full-sphere.odb \
- incomp-newtonian.odb \
- incomp-non-newtonian.odb \
- regional.odb \
- regional-sphere.odb \
- temp.odb \
- __vault__.odb
## end of Makefile.am
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 59c8613..8c8ce06 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -27,21 +27,6 @@
noinst_LIBRARIES =
lib_LTLIBRARIES =
-if COND_PYRE
-
-if COND_EMBEDDING
- # static library
- noinst_LIBRARIES += libCitcomS.a
-else
- # shared library (libtool)
- lib_LTLIBRARIES += libCitcomS.la
-endif
-
-else
- # static library
- noinst_LIBRARIES += libCitcomS.a
-endif
-
AM_CPPFLAGS =
if COND_HDF5
AM_CPPFLAGS += -DUSE_HDF5
More information about the CIG-COMMITS
mailing list