From ba8c433e6a2eafa48a3b771eb86c5f4533c3f1b1 Mon Sep 17 00:00:00 2001 From: Scott R Charlton Date: Wed, 1 Apr 2015 01:37:35 +0000 Subject: [PATCH] adding CMake files for dist git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9443 1feff8c3-07ed-0310-ac33-dd36852eb9cd --- Makefile.am | 7 ++++++- packages/configure/Makefile | 2 +- tests/Makefile.am | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index c1bc7f5e..ce00803b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,8 @@ ACLOCAL_AMFLAGS = -I m4 -EXTRA_DIST = INSTALL README IPhreeqc.2005.vcproj IPhreeqc.2005.sln IPhreeqc.vsprops IPhreeqc.rc resource.h +EXTRA_DIST =\ + CMakeLists.txt\ + INSTALL\ + IPhreeqc.rc\ + README\ + resource.h SUBDIRS = src tests examples doc diff --git a/packages/configure/Makefile b/packages/configure/Makefile index aa458934..580d1c98 100644 --- a/packages/configure/Makefile +++ b/packages/configure/Makefile @@ -39,7 +39,7 @@ $(CONF_PKG) : ../$(TARBALL) cd $(NAME)-$(VER)-$(REL) && autoreconf -fvi cd $(NAME)-$(VER)-$(REL) && mkdir _build cd $(NAME)-$(VER)-$(REL) && cd _build && ../configure - cd $(NAME)-$(VER)-$(REL) && cd _build && make distcheck + cd $(NAME)-$(VER)-$(REL) && cd _build && $(MAKE) distcheck mv $(NAME)-$(VER)-$(REL)/_build/$(CONF_PKG) . rm -rf $(NAME)-$(VER)-$(REL) diff --git a/tests/Makefile.am b/tests/Makefile.am index 0f91476f..d5916b2c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,4 @@ -EXTRA_DIST = test_c.vcproj test_cxx.vcproj test_f90.vfproj test_f.vfproj main77.f main.f90 +EXTRA_DIST = CMakeLists.txt main77.f main.f90 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/phreeqcpp -I$(top_srcdir)/src/phreeqcpp/PhreeqcKeywords AM_FCFLAGS = -I$(top_srcdir)/src