[cig-commits] [commit] master, python-removal, rajesh-petsc-schur: Fixed Makefile.am files for Python and Pyre removal (c9d9c4b)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/citcoms

On branches: master,python-removal,rajesh-petsc-schur
Link       : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd

>---------------------------------------------------------------

commit c9d9c4b274352c86bda01c0cf9e07c726492ed38
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Thu Aug 21 10:32:21 2014 -0700

    Fixed Makefile.am files for Python and Pyre removal


>---------------------------------------------------------------

c9d9c4b274352c86bda01c0cf9e07c726492ed38
 bin/Makefile.am | 7 +++----
 etc/Makefile.am | 1 -
 lib/Makefile.am | 7 +++++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 2055e20..4a76f37 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -33,15 +33,14 @@ endif
 
 bin_PROGRAMS = CitcomSFull CitcomSRegional
 
-######## legacy drivers ########
-
+bin_SCRIPTS =
 
+######## C drivers ########
 CitcomSFull_SOURCES = Citcom.c CitcomSFull.c
 CitcomSFull_LDADD = $(libCitcomS)
 CitcomSRegional_SOURCES = Citcom.c CitcomSRegional.c
 CitcomSRegional_LDADD = $(libCitcomS)
 
-abs_top_builddir = @abs_top_builddir@
-abs_builddir = @abs_builddir@
+libCitcomS = $(top_builddir)/lib/libCitcomS.a
 
 ## end of Makefile.am
diff --git a/etc/Makefile.am b/etc/Makefile.am
index 5962819..a817303 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -23,5 +23,4 @@
 
 # $Id$
 
-
 ## end of Makefile.am
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 8c8ce06..83861d1 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -27,6 +27,9 @@
 noinst_LIBRARIES =
 lib_LTLIBRARIES =
 
+# static library
+noinst_LIBRARIES += libCitcomS.a
+
 AM_CPPFLAGS =
 if COND_HDF5
     AM_CPPFLAGS += -DUSE_HDF5
@@ -48,8 +51,8 @@ libCitcomS_a_CFLAGS = $(AM_CFLAGS) # hack for automake
 libCitcomS_a_SOURCES = $(sources)
 
 # shared library (libtool)
-libCitcomS_la_LDFLAGS = -release $(VERSION)
-libCitcomS_la_SOURCES = $(sources)
+#libCitcomS_la_LDFLAGS = -release $(VERSION)
+#libCitcomS_la_SOURCES = $(sources)
 
 sources = \
 	Advection_diffusion.c \