From 389e96035f58624b25bd74556230b852ecccb787 Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Mon, 16 Mar 2009 22:48:29 +0000 Subject: [PATCH] Further cleanup of the demos structure. --- Cantera/cxx/demos/Makefile.in | 8 ++++---- Cantera/cxx/demos/NASA_coeffs/.cvsignore | 2 ++ Cantera/cxx/demos/NASA_coeffs/Makefile.in | 2 +- Cantera/cxx/demos/NASA_coeffs/Makefile.install.in | 2 +- Cantera/cxx/demos/combustor/.cvsignore | 3 ++- Cantera/cxx/demos/combustor/Makefile.in | 2 +- Cantera/cxx/demos/combustor/Makefile.install.in | 2 +- Cantera/cxx/demos/flamespeed/.cvsignore | 1 + Cantera/cxx/demos/flamespeed/Makefile.in | 2 +- Cantera/cxx/demos/flamespeed/Makefile.install.in | 2 +- Cantera/cxx/demos/kinetics1/.cvsignore | 3 ++- Cantera/cxx/demos/kinetics1/Makefile.in | 2 +- Cantera/cxx/demos/kinetics1/Makefile.install.in | 2 +- Cantera/cxx/demos/rankine/.cvsignore | 2 ++ Cantera/cxx/demos/rankine/Makefile.in | 2 +- Cantera/cxx/demos/rankine/Makefile.install.in | 2 +- 16 files changed, 23 insertions(+), 16 deletions(-) diff --git a/Cantera/cxx/demos/Makefile.in b/Cantera/cxx/demos/Makefile.in index 5885c1448..07f06f6c7 100644 --- a/Cantera/cxx/demos/Makefile.in +++ b/Cantera/cxx/demos/Makefile.in @@ -12,10 +12,10 @@ all: cd NASA_coeffs; @MAKE@ test: - cd combustor; @MAKE@ test - cd kinetics1; @MAKE@ test - cd flamespeed; @MAKE@ test - cd NASA_coeffs; @MAKE@ test + cd combustor; @MAKE@ -s test + cd kinetics1; @MAKE@ -s test + cd flamespeed; @MAKE@ -s test + cd NASA_coeffs; @MAKE@ -s test install: @INSTALL@ -d @ct_demodir@/cxx diff --git a/Cantera/cxx/demos/NASA_coeffs/.cvsignore b/Cantera/cxx/demos/NASA_coeffs/.cvsignore index 75cd1c2b8..86af44853 100644 --- a/Cantera/cxx/demos/NASA_coeffs/.cvsignore +++ b/Cantera/cxx/demos/NASA_coeffs/.cvsignore @@ -7,3 +7,5 @@ gri30.xml h2o2.xml output_0.txt transport_log.xml +*.d +.depends diff --git a/Cantera/cxx/demos/NASA_coeffs/Makefile.in b/Cantera/cxx/demos/NASA_coeffs/Makefile.in index a37143bd5..4038fa2b5 100644 --- a/Cantera/cxx/demos/NASA_coeffs/Makefile.in +++ b/Cantera/cxx/demos/NASA_coeffs/Makefile.in @@ -72,7 +72,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT) DEPENDS = $(OBJS:.o=.d) -all: $(PROGRAM) +all: $(PROGRAM) .depends $(PROGRAM): $(OBJS) $(PURIFY) $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(CANTERA_LIBS) \ diff --git a/Cantera/cxx/demos/NASA_coeffs/Makefile.install.in b/Cantera/cxx/demos/NASA_coeffs/Makefile.install.in index 011c83847..a912da213 100644 --- a/Cantera/cxx/demos/NASA_coeffs/Makefile.install.in +++ b/Cantera/cxx/demos/NASA_coeffs/Makefile.install.in @@ -65,7 +65,7 @@ DEPENDS=$(OBJS:.o=.d) # Program Name PROGRAM = $(PROG_NAME)$(EXE_EXT) -all: $(PROGRAM) +all: $(PROGRAM) .depends $(PROGRAM): $(OBJS) $(CANTERA_CORE_LIBS_DEP) $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \ diff --git a/Cantera/cxx/demos/combustor/.cvsignore b/Cantera/cxx/demos/combustor/.cvsignore index 5db26bd05..317ef1644 100644 --- a/Cantera/cxx/demos/combustor/.cvsignore +++ b/Cantera/cxx/demos/combustor/.cvsignore @@ -8,4 +8,5 @@ ct2ctml.log diff_csv.txt gri30.xml output_0.txt - +*.d +.depends diff --git a/Cantera/cxx/demos/combustor/Makefile.in b/Cantera/cxx/demos/combustor/Makefile.in index 60046db86..4c3537d33 100644 --- a/Cantera/cxx/demos/combustor/Makefile.in +++ b/Cantera/cxx/demos/combustor/Makefile.in @@ -71,7 +71,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT) DEPENDS = $(OBJS:.o=.d) -all: $(PROGRAM) +all: $(PROGRAM) .depends $(PROGRAM): $(OBJS) $(PURIFY) $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(CANTERA_LIBS) \ diff --git a/Cantera/cxx/demos/combustor/Makefile.install.in b/Cantera/cxx/demos/combustor/Makefile.install.in index ce94af301..da8cdbb96 100644 --- a/Cantera/cxx/demos/combustor/Makefile.install.in +++ b/Cantera/cxx/demos/combustor/Makefile.install.in @@ -65,7 +65,7 @@ DEPENDS=$(OBJS:.o=.d) # Program Name PROGRAM = $(PROG_NAME)$(EXE_EXT) -all: $(PROGRAM) +all: $(PROGRAM) .depends $(PROGRAM): $(OBJS) $(CANTERA_CORE_LIBS_DEP) $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \ diff --git a/Cantera/cxx/demos/flamespeed/.cvsignore b/Cantera/cxx/demos/flamespeed/.cvsignore index 4c518c570..327718f86 100644 --- a/Cantera/cxx/demos/flamespeed/.cvsignore +++ b/Cantera/cxx/demos/flamespeed/.cvsignore @@ -10,3 +10,4 @@ flamespeed.d gri30.xml output_0.txt transport_log.xml +*.d diff --git a/Cantera/cxx/demos/flamespeed/Makefile.in b/Cantera/cxx/demos/flamespeed/Makefile.in index 791acd95c..b55941e5b 100644 --- a/Cantera/cxx/demos/flamespeed/Makefile.in +++ b/Cantera/cxx/demos/flamespeed/Makefile.in @@ -72,7 +72,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT) DEPENDS = $(OBJS:.o=.d) -all: $(PROGRAM) +all: $(PROGRAM) .depends $(PROGRAM): $(OBJS) $(PURIFY) $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(CANTERA_LIBS) \ diff --git a/Cantera/cxx/demos/flamespeed/Makefile.install.in b/Cantera/cxx/demos/flamespeed/Makefile.install.in index a5b7e35f4..70b32bc5d 100644 --- a/Cantera/cxx/demos/flamespeed/Makefile.install.in +++ b/Cantera/cxx/demos/flamespeed/Makefile.install.in @@ -65,7 +65,7 @@ DEPENDS=$(OBJS:.o=.d) # Program Name PROGRAM = $(PROG_NAME)$(EXE_EXT) -all: $(PROGRAM) +all: $(PROGRAM) .depends $(PROGRAM): $(OBJS) $(CANTERA_CORE_LIBS_DEP) $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \ diff --git a/Cantera/cxx/demos/kinetics1/.cvsignore b/Cantera/cxx/demos/kinetics1/.cvsignore index ba3f18152..a47358367 100644 --- a/Cantera/cxx/demos/kinetics1/.cvsignore +++ b/Cantera/cxx/demos/kinetics1/.cvsignore @@ -9,4 +9,5 @@ kin1.dat kinetics1 output_0.txt transport_log.xml - +.depends +*.d diff --git a/Cantera/cxx/demos/kinetics1/Makefile.in b/Cantera/cxx/demos/kinetics1/Makefile.in index 3d83ba099..336a2eb92 100644 --- a/Cantera/cxx/demos/kinetics1/Makefile.in +++ b/Cantera/cxx/demos/kinetics1/Makefile.in @@ -72,7 +72,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT) DEPENDS = $(OBJS:.o=.d) -all: $(PROGRAM) +all: $(PROGRAM) .depends $(PROGRAM): $(OBJS) $(PURIFY) $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(CANTERA_LIBS) \ diff --git a/Cantera/cxx/demos/kinetics1/Makefile.install.in b/Cantera/cxx/demos/kinetics1/Makefile.install.in index 7b0bf4f4b..d52bc9a2f 100644 --- a/Cantera/cxx/demos/kinetics1/Makefile.install.in +++ b/Cantera/cxx/demos/kinetics1/Makefile.install.in @@ -65,7 +65,7 @@ DEPENDS=$(OBJS:.o=.d) # Program Name PROGRAM = $(PROG_NAME)$(EXE_EXT) -all: $(PROGRAM) +all: $(PROGRAM) .depends $(PROGRAM): $(OBJS) $(CANTERA_CORE_LIBS_DEP) $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \ diff --git a/Cantera/cxx/demos/rankine/.cvsignore b/Cantera/cxx/demos/rankine/.cvsignore index 58a7e702e..22999d1e1 100644 --- a/Cantera/cxx/demos/rankine/.cvsignore +++ b/Cantera/cxx/demos/rankine/.cvsignore @@ -7,3 +7,5 @@ liquidvapor.xml output_0.txt rankine transport_log.xml +*.d +.depends diff --git a/Cantera/cxx/demos/rankine/Makefile.in b/Cantera/cxx/demos/rankine/Makefile.in index 885be5156..05d776af6 100644 --- a/Cantera/cxx/demos/rankine/Makefile.in +++ b/Cantera/cxx/demos/rankine/Makefile.in @@ -72,7 +72,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT) DEPENDS = $(OBJS:.o=.d) -all: $(PROGRAM) +all: $(PROGRAM) .depends $(PROGRAM): $(OBJS) $(PURIFY) $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(CANTERA_LIBS) \ diff --git a/Cantera/cxx/demos/rankine/Makefile.install.in b/Cantera/cxx/demos/rankine/Makefile.install.in index 806b71f5d..7e155dd6e 100644 --- a/Cantera/cxx/demos/rankine/Makefile.install.in +++ b/Cantera/cxx/demos/rankine/Makefile.install.in @@ -65,7 +65,7 @@ DEPENDS=$(OBJS:.o=.d) # Program Name PROGRAM = $(PROG_NAME)$(EXE_EXT) -all: $(PROGRAM) +all: $(PROGRAM) .depends $(PROGRAM): $(OBJS) $(CANTERA_CORE_LIBS_DEP) $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \