From abcd4fb0aaac6aaa1a3f1ee0a2dfd1072bec68df Mon Sep 17 00:00:00 2001 From: Nicholas Malaya Date: Fri, 11 Nov 2011 15:55:22 +0000 Subject: [PATCH] [cantera+autotools]: adding makefile.am --- Cantera/src/base/Makefile.am | 12 +++++ Cantera/src/base/Makefile.in | 93 ------------------------------------ 2 files changed, 12 insertions(+), 93 deletions(-) create mode 100644 Cantera/src/base/Makefile.am delete mode 100644 Cantera/src/base/Makefile.in diff --git a/Cantera/src/base/Makefile.am b/Cantera/src/base/Makefile.am new file mode 100644 index 000000000..819479652 --- /dev/null +++ b/Cantera/src/base/Makefile.am @@ -0,0 +1,12 @@ +h_sources = ct_defs.h ctexceptions.h logger.h XML_Writer.h \ + ctml.h plots.h stringUtils.h xml.h config.h utilities.h \ + Array.h vec_functions.h global.h FactoryBase.h clockWC.h \ + PrintCtrl.h LogPrintCtrl.h mdp_allo.h + +cc_sources = ct2ctml.cpp ctml.cpp misc.cpp plots.cpp stringUtils.cpp xml.cpp clockWC.cpp\ + PrintCtrl.cpp LogPrintCtrl.cpp mdp_allo.cpp checkFinite.cpp + +INCLUDES = +AM_FCFLAGS = $(INCLUDES) +AM_CFLAGS = $(INCLUDES) +AM_CPPFLAGS = $(INCLUDES) diff --git a/Cantera/src/base/Makefile.in b/Cantera/src/base/Makefile.in deleted file mode 100644 index 7d00cb58a..000000000 --- a/Cantera/src/base/Makefile.in +++ /dev/null @@ -1,93 +0,0 @@ -#/bin/sh -############################################################### -# $Author$ -# $Date$ -# $Revision$ -# -# Copyright 2002 California Institute of Technology -# -############################################################### - -.SUFFIXES : -.SUFFIXES : .cpp .d .o .h - -INCDIR = ../../../build/include/cantera/kernel -INSTALL_TSC = ../../../bin/install_tsc -do_ranlib = @DO_RANLIB@ - -debug_mode = @CANTERA_DEBUG_MODE@ -ifeq ($(debug_mode), 1) - DEBUG_FLAG=-DDEBUG_MODE -else - DEBUG_FLAG= -endif - -PURIFY=@PURIFY@ - -PIC_FLAG=@PIC@ - -CXX_FLAGS = @CXXFLAGS@ $(LOCAL_DEFS) $(CXX_OPT) $(PIC_FLAG) $(DEBUG_FLAG) - -BASE_OBJ = ct2ctml.o ctml.o misc.o plots.o stringUtils.o xml.o clockWC.o\ - PrintCtrl.o LogPrintCtrl.o mdp_allo.o checkFinite.o - -BASE_H = ct_defs.h ctexceptions.h logger.h XML_Writer.h \ - ctml.h plots.h stringUtils.h xml.h config.h utilities.h \ - Array.h vec_functions.h global.h FactoryBase.h clockWC.h \ - PrintCtrl.h LogPrintCtrl.h mdp_allo.h - -CXX_INCLUDES = -I. @CXX_INCLUDES@ -LIB = @buildlib@/libctbase.a - -DEPENDS = $(BASE_OBJ:.o=.d) - -all: $(LIB) .depends - @(@INSTALL@ -d $(INCDIR)) - @(for lh in $(BASE_H) ; do \ - $(INSTALL_TSC) "$${lh}" $(INCDIR) ; \ - done) - -%.d: Makefile %.o - @CXX_DEPENDS@ $(CXX_FLAGS) $(CXX_INCLUDES) $*.cpp > $*.d - -.cpp.o: - $(PURIFY) @CXX@ -c $< $(CXX_FLAGS) $(CXX_INCLUDES) - -$(LIB): $(BASE_OBJ) $(BASE_H) - @ARCHIVE@ $(LIB) $(BASE_OBJ) > /dev/null -ifeq ($(do_ranlib),1) - @RANLIB@ $(LIB) -endif - -clean: - @(for lh in dummy.h $(BASE_H) ; do \ - th=$(INCDIR)/"$${lh}" ; \ - if test -f "$${th}" ; then \ - $(RM) "$${th}" ; \ - echo "$(RM) $${th}" ; \ - fi \ - done) - @(if test -f $(LIB) ; then \ - $(RM) $(LIB) ; \ - echo "$(RM) $(LIB)" ; \ - fi) - $(RM) *.o *~ .depends *.d - (if test -d SunWS_cache ; then \ - $(RM) -rf SunWS_cache ; \ - fi ) - -depends: - @MAKE@ .depends - -.depends: $(DEPENDS) - cat $(DEPENDS) > .depends - -$(BASE_OBJ): Makefile - -TAGS: - etags *.h *.cpp - -ifeq ($(wildcard .depends), .depends) -include .depends -endif -