[cig-commits] [commit] master, rajesh-petsc-schur: Removed Makefiles that shouldn't be in the repo (cd9c72f)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Nov 5 19:15:08 PST 2014
Repository : https://github.com/geodynamics/citcoms
On branches: master,rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd
>---------------------------------------------------------------
commit cd9c72f4a064d8e1a7cca84608269060ff274fd1
Author: Eric Heien <emheien at ucdavis.edu>
Date: Thu Oct 9 16:31:02 2014 -0700
Removed Makefiles that shouldn't be in the repo
>---------------------------------------------------------------
cd9c72f4a064d8e1a7cca84608269060ff274fd1
visual/OpenDXMacro/Makefile | 119 +++++++++++++++--------------------------
visual/OpenDXMacro/Makefile.in | 33 +-----------
2 files changed, 45 insertions(+), 107 deletions(-)
diff --git a/visual/OpenDXMacro/Makefile b/visual/OpenDXMacro/Makefile
index 7e72e2b..1a6bb02 100644
--- a/visual/OpenDXMacro/Makefile
+++ b/visual/OpenDXMacro/Makefile
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# visual/OpenDXMacro/Makefile. Generated from Makefile.in by configure.
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -78,14 +78,13 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = x86_64-unknown-linux-gnu
-host_triplet = x86_64-unknown-linux-gnu
+build_triplet = x86_64-apple-darwin13.4.0
+host_triplet = x86_64-apple-darwin13.4.0
subdir = visual/OpenDXMacro
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(dist_dxmacro_DATA)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/cit_hdf.m4 \
- $(top_srcdir)/m4/cit_mpi.m4 $(top_srcdir)/m4/cit_python.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
@@ -145,19 +144,19 @@ am__installdirs = "$(DESTDIR)$(dxmacrodir)" "$(DESTDIR)$(dxmacrodir)"
DATA = $(dist_dxmacro_DATA) $(nodist_dxmacro_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/rakuko/CitcomS-GitHub-python_removal/aux-config/missing aclocal-1.13
+ACLOCAL = ${SHELL} /Users/eheien/Documents/CIG_Codes/citcoms/aux-config/missing aclocal-1.14
AMTAR = $${TAR-tar}
AM_DEFAULT_VERBOSITY = 1
AR = ar
-AUTOCONF = ${SHELL} /home/rakuko/CitcomS-GitHub-python_removal/aux-config/missing autoconf
-AUTOHEADER = ${SHELL} /home/rakuko/CitcomS-GitHub-python_removal/aux-config/missing autoheader
-AUTOMAKE = ${SHELL} /home/rakuko/CitcomS-GitHub-python_removal/aux-config/missing automake-1.13
-AWK = gawk
+AUTOCONF = ${SHELL} /Users/eheien/Documents/CIG_Codes/citcoms/aux-config/missing autoconf
+AUTOHEADER = ${SHELL} /Users/eheien/Documents/CIG_Codes/citcoms/aux-config/missing autoheader
+AUTOMAKE = ${SHELL} /Users/eheien/Documents/CIG_Codes/citcoms/aux-config/missing automake-1.14
+AWK = awk
CC = mpicc
CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -DH5_USE_16_API
+CFLAGS = -g -O2
CPP = mpicc -E
-CPPFLAGS = -DUSE_GZDIR -I/home/rakuko/hdf5-1.8.12/include
+CPPFLAGS = -DUSE_GZDIR
CXX = mpicxx
CXXCPP = mpicxx -E
CXXDEPMODE = depmode=gcc3
@@ -166,82 +165,57 @@ CYGPATH_W = echo
DEFS = -DHAVE_CONFIG_H
DEPDIR = .deps
DLLTOOL = false
-DSYMUTIL =
+DSYMUTIL = dsymutil
DUMPBIN =
-ECHO_C =
-ECHO_N = -n
+ECHO_C = \c
+ECHO_N =
ECHO_T =
-EGREP = /bin/grep -E
+EGREP = /usr/bin/grep -E
EXEEXT =
-FGREP = /bin/grep -F
-GREP = /bin/grep
+FGREP = /usr/bin/grep -F
+GREP = /usr/bin/grep
HC_HOME =
INSTALL = /usr/bin/install -c
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LD = /usr/bin/ld -m elf_x86_64
-LDFLAGS = -L/home/rakuko/hdf5-1.8.12/lib
+LD = /opt/local/bin/ld
+LDFLAGS =
LIBOBJS =
-LIBS = -lm -lz -lhdf5
+LIBS = -lz
LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LIPO =
+LIPO = lipo
LN_S = ln -s
LTLIBOBJS =
-MAKEINFO = ${SHELL} /home/rakuko/CitcomS-GitHub-python_removal/aux-config/missing makeinfo
+MAKEINFO = ${SHELL} /Users/eheien/Documents/CIG_Codes/citcoms/aux-config/missing makeinfo
MANIFEST_TOOL = :
-MKDIR_P = /bin/mkdir -p
-NM = /usr/bin/nm -B
-NMEDIT =
-OBJDUMP = objdump
+MKDIR_P = ../.././aux-config/install-sh -c -d
+NM = /opt/local/bin/nm
+NMEDIT = nmedit
+OBJDUMP = false
OBJEXT = o
-OTOOL =
-OTOOL64 =
+OTOOL = otool
+OTOOL64 = :
PACKAGE = CitcomS
PACKAGE_BUGREPORT = cig-mc at geodynamics.org
PACKAGE_NAME = CitcomS
-PACKAGE_STRING = CitcomS 3.2.0
+PACKAGE_STRING = CitcomS 3.3.0
PACKAGE_TARNAME = CitcomS
PACKAGE_URL =
-PACKAGE_VERSION = 3.2.0
+PACKAGE_VERSION = 3.3.0
PATH_SEPARATOR = :
-PHDF5_HOME = /home/rakuko/hdf5-1.8.12
-PYCONFIG =
-PYTHON =
-PYTHONPATH = /home/rakuko/vtk-6.0.0/lib/python2.7/site-packages:/home/rakuko/91code/lib/python2.7/site-packages
-PYTHON_BLDLIBRARY =
-PYTHON_EGG_CFLAGS =
-PYTHON_EGG_CPPFLAGS =
-PYTHON_EGG_LDFLAGS =
-PYTHON_EGG_LIBS =
-PYTHON_EGG_PYXFLAGS =
-PYTHON_EXEC_PREFIX =
-PYTHON_INCDIR =
-PYTHON_LA_LDFLAGS =
-PYTHON_LDFLAGS =
-PYTHON_LDLAST =
-PYTHON_LDLIBRARY =
-PYTHON_LIBDIR =
-PYTHON_LIBP =
-PYTHON_LIBPL =
-PYTHON_LIBS =
-PYTHON_LINKFORSHARED =
-PYTHON_MODLIBS =
-PYTHON_PLATFORM =
-PYTHON_PREFIX =
-PYTHON_SYSLIBS =
-PYTHON_VERSION =
+PHDF5_HOME =
RANLIB = ranlib
-SED = /bin/sed
+SED = /usr/bin/sed
SET_MAKE =
-SHELL = /bin/bash
+SHELL = /bin/sh
STRIP = strip
-VERSION = 3.2.0
-abs_builddir = /home/rakuko/CitcomS-GitHub-python_removal/visual/OpenDXMacro
-abs_srcdir = /home/rakuko/CitcomS-GitHub-python_removal/visual/OpenDXMacro
-abs_top_builddir = /home/rakuko/CitcomS-GitHub-python_removal
-abs_top_srcdir = /home/rakuko/CitcomS-GitHub-python_removal
+VERSION = 3.3.0
+abs_builddir = /Users/eheien/Documents/CIG_Codes/citcoms/visual/OpenDXMacro
+abs_srcdir = /Users/eheien/Documents/CIG_Codes/citcoms/visual/OpenDXMacro
+abs_top_builddir = /Users/eheien/Documents/CIG_Codes/citcoms
+abs_top_srcdir = /Users/eheien/Documents/CIG_Codes/citcoms
ac_ct_AR = ar
ac_ct_CC = mpicc
ac_ct_CXX = mpicxx
@@ -252,26 +226,26 @@ am__quote =
am__tar = $${TAR-tar} chof - "$$tardir"
am__untar = $${TAR-tar} xf -
bindir = ${exec_prefix}/bin
-build = x86_64-unknown-linux-gnu
+build = x86_64-apple-darwin13.4.0
build_alias =
build_cpu = x86_64
-build_os = linux-gnu
-build_vendor = unknown
+build_os = darwin13.4.0
+build_vendor = apple
builddir = .
datadir = ${datarootdir}
datarootdir = ${prefix}/share
docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
dvidir = ${docdir}
exec_prefix = ${prefix}
-host = x86_64-unknown-linux-gnu
+host = x86_64-apple-darwin13.4.0
host_alias =
host_cpu = x86_64
-host_os = linux-gnu
-host_vendor = unknown
+host_os = darwin13.4.0
+host_vendor = apple
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = ${SHELL} /home/rakuko/CitcomS-GitHub-python_removal/aux-config/install-sh
+install_sh = ${SHELL} /Users/eheien/Documents/CIG_Codes/citcoms/aux-config/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
@@ -280,14 +254,9 @@ mandir = ${datarootdir}/man
mkdir_p = $(MKDIR_P)
oldincludedir = /usr/include
pdfdir = ${docdir}
-pkgpyexecdir =
-pkgpythondir =
-pkgsysconfdir =
prefix = /usr/local
program_transform_name = s,x,x,
psdir = ${docdir}
-pyexecdir =
-pythondir =
sbindir = ${exec_prefix}/sbin
sharedstatedir = ${prefix}/com
srcdir = .
diff --git a/visual/OpenDXMacro/Makefile.in b/visual/OpenDXMacro/Makefile.in
index b20c542..2fc28ab 100644
--- a/visual/OpenDXMacro/Makefile.in
+++ b/visual/OpenDXMacro/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -85,7 +85,6 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(dist_dxmacro_DATA)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/cit_hdf.m4 \
- $(top_srcdir)/m4/cit_mpi.m4 $(top_srcdir)/m4/cit_python.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
@@ -207,31 +206,6 @@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PHDF5_HOME = @PHDF5_HOME@
-PYCONFIG = @PYCONFIG@
-PYTHON = @PYTHON@
-PYTHONPATH = @PYTHONPATH@
-PYTHON_BLDLIBRARY = @PYTHON_BLDLIBRARY@
-PYTHON_EGG_CFLAGS = @PYTHON_EGG_CFLAGS@
-PYTHON_EGG_CPPFLAGS = @PYTHON_EGG_CPPFLAGS@
-PYTHON_EGG_LDFLAGS = @PYTHON_EGG_LDFLAGS@
-PYTHON_EGG_LIBS = @PYTHON_EGG_LIBS@
-PYTHON_EGG_PYXFLAGS = @PYTHON_EGG_PYXFLAGS@
-PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_INCDIR = @PYTHON_INCDIR@
-PYTHON_LA_LDFLAGS = @PYTHON_LA_LDFLAGS@
-PYTHON_LDFLAGS = @PYTHON_LDFLAGS@
-PYTHON_LDLAST = @PYTHON_LDLAST@
-PYTHON_LDLIBRARY = @PYTHON_LDLIBRARY@
-PYTHON_LIBDIR = @PYTHON_LIBDIR@
-PYTHON_LIBP = @PYTHON_LIBP@
-PYTHON_LIBPL = @PYTHON_LIBPL@
-PYTHON_LIBS = @PYTHON_LIBS@
-PYTHON_LINKFORSHARED = @PYTHON_LINKFORSHARED@
-PYTHON_MODLIBS = @PYTHON_MODLIBS@
-PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_SYSLIBS = @PYTHON_SYSLIBS@
-PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
@@ -280,14 +254,9 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-pkgpyexecdir = @pkgpyexecdir@
-pkgpythondir = @pkgpythondir@
-pkgsysconfdir = @pkgsysconfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
-pyexecdir = @pyexecdir@
-pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
More information about the CIG-COMMITS
mailing list