[cig-commits] [commit] master: Fixed Makefile.am distribution lines (20c677c)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Thu Oct 9 16:50:07 PDT 2014
Repository : https://github.com/geodynamics/citcoms
On branch : master
Link : https://github.com/geodynamics/citcoms/compare/6bdecb76738d7444f5e59e1a6132cdad2f28f3f2...20c677ca1ae0e9054f668c81db5fdf44fed97a54
>---------------------------------------------------------------
commit 20c677ca1ae0e9054f668c81db5fdf44fed97a54
Author: Eric Heien <emheien at ucdavis.edu>
Date: Thu Oct 9 16:50:35 2014 -0700
Fixed Makefile.am distribution lines
>---------------------------------------------------------------
20c677ca1ae0e9054f668c81db5fdf44fed97a54
Makefile.am | 2 +-
Py2C/Makefile.am | 2 +-
examples/Makefile.am | 27 ++++++++++-----------------
3 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 7f12585..b4bc793 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,6 +26,6 @@
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = lib bin Py2C
+SUBDIRS = Py2C etc examples tests visual lib bin
## end of Makefile.am
diff --git a/Py2C/Makefile.am b/Py2C/Makefile.am
index fe2229f..6dc4607 100644
--- a/Py2C/Makefile.am
+++ b/Py2C/Makefile.am
@@ -31,6 +31,6 @@ bin_PROGRAMS = Py2C
bin_SCRIPTS =
######## C drivers ########
-Py2C_SOURCES = Py2CMain.cpp Py2C.cpp
+Py2C_SOURCES = Py2CMain.cpp Py2C.cpp Py2C.hpp
## end of Makefile.am
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 169588e..0aaf76d 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -26,12 +26,12 @@
examplesdir = $(pkgdatadir)/examples
nobase_dist_examples_DATA = \
- Cookbook1/cookbook1.cfg \
- Cookbook2/cookbook2.cfg \
- Cookbook3/cookbook3.cfg \
- Cookbook4/cookbook4.cfg \
+ Cookbook1/cookbook1 \
+ Cookbook2/cookbook2 \
+ Cookbook3/cookbook3 \
+ Cookbook4/cookbook4 \
Cookbook4/coor.dat \
- Cookbook5/cookbook5.cfg \
+ Cookbook5/cookbook5 \
Cookbook5/coor.dat \
Cookbook5/ic/cookbook5.velo.0.0 \
Cookbook5/ic/cookbook5.velo.1.0 \
@@ -92,21 +92,14 @@ nobase_dist_examples_DATA = \
Cookbook5/velocity/bvel.dat7 \
Cookbook5/velocity/bvel.dat8 \
Cookbook5/velocity/bvel.dat9 \
- Cookbook6/cookbook6.cfg \
+ Cookbook6/cookbook6 \
Cookbook6/coord.dat \
Cookbook6/README \
- Cookbook7/cookbook7.cfg \
- Cookbook8/cookbook8.cfg \
+ Cookbook7/cookbook7 \
+ Cookbook8/cookbook8 \
Cookbook8/coord.dat \
- Cookbook9/cookbook9.cfg \
- Cookbook9/ic/cntn.velo.0.0 \
- Cookbook9/ic/cntn.velo.1.0 \
- Cookbook9/ic/embd.velo.0.0 \
- Cookbook9/ic/embd.velo.1.0 \
- Cookbook9/velocity/bvel.dat0 \
- Cookbook9/velocity/bvel.dat1 \
- example0.cfg \
- example1.cfg \
+ example0 \
+ example1 \
Full/input.sample \
Full/machine.sample \
Full/velbc/README \
More information about the CIG-COMMITS
mailing list