[cig-commits] [commit] master, python-removal, rajesh-petsc-schur: Changes to include Py2C in the build process (75fda8c)

[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 75fda8c27c09862ed9421f27fa74aec3630b45e1
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Wed Aug 27 14:31:05 2014 -0700

    Changes to include Py2C in the build process


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

75fda8c27c09862ed9421f27fa74aec3630b45e1
 Makefile.am                     | 2 +-
 Py2C/Makefile                   | 5 -----
 Makefile.am => Py2C/Makefile.am | 9 +++++++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a65720c..7f12585 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,6 +26,6 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = lib bin
+SUBDIRS = lib bin Py2C
 
 ## end of Makefile.am
diff --git a/Py2C/Makefile b/Py2C/Makefile
deleted file mode 100644
index a6517a7..0000000
--- a/Py2C/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-Py2C.exe : Py2CMain.cpp Py2C.cpp
-	g++ -std=c++11 -o Py2C.exe Py2CMain.cpp Py2C.cpp
-
-clean:
-	rm -f *.exe *.o
diff --git a/Makefile.am b/Py2C/Makefile.am
similarity index 88%
copy from Makefile.am
copy to Py2C/Makefile.am
index a65720c..986959e 100644
--- a/Makefile.am
+++ b/Py2C/Makefile.am
@@ -24,8 +24,13 @@
 # $Id$
 
 
-ACLOCAL_AMFLAGS = -I m4
+AM_CPPFLAGS = -std=c++11
 
-SUBDIRS = lib bin
+bin_PROGRAMS = ../bin/Py2C
+
+bin_SCRIPTS =
+
+######## C drivers ########
+Py2C_SOURCES = Py2CMain.cpp Py2C.cpp
 
 ## end of Makefile.am