]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Cleanup
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 26 Sep 2012 07:57:30 +0000 (07:57 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 26 Sep 2012 07:57:30 +0000 (07:57 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26745 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/config/Config.cmake.in
deal.II/config/Make.rules [deleted file]

index f96c2666faa525500894f8ecd86823ad2a7e5df0..95cb4dcf67928324a3cd8a0d9041f5c38e2b2c6c 100644 (file)
@@ -39,6 +39,7 @@ SET(DEAL_II_PROJECT_CONFIG_RELDIR "${DEAL_II_PROJECT_CONFIG_RELDIR}")
 #
 
 SET(DEAL_II_BUILD_TYPE "${CMAKE_BUILD_TYPE}")
+SET(DEAL_II_BUILD_TYPES "${CMAKE_BUILD_TYPES}")
 
 SET(DEAL_II_CXX_COMPILER "${CMAKE_CXX_COMPILER}")
 SET(DEAL_II_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
@@ -54,9 +55,6 @@ SET(DEAL_II_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
 SET(DEAL_II_LINKER_FLAGS_DEBUG "${DEAL_II_SHARED_LINKER_FLAGS_DEBUG}")
 SET(DEAL_II_LINKER_FLAGS_RELEASE "${DEAL_II_SHARED_LINKER_FLAGS_RELEASE}")
 
-SET(DEAL_II_LINKER "${CMAKE_LINKER}")
-SET(DEAL_II_AR "${CMAKE_AR}")
-
 #
 # Information on where to find the deal.II libraries and headers
 #
diff --git a/deal.II/config/Make.rules b/deal.II/config/Make.rules
deleted file mode 100644 (file)
index ebfeba3..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-############################################################
-# Include general settings for including DEAL libraries
-############################################################
-
-include $D/common/Make.global_options
-
-
-############################################################
-# Targets for compilation
-############################################################
-
-ifneq ($(enable-threads),no)
-  MT = MT
-else
-  MT = ==
-endif
-
-%.g.$(OBJEXT) : %.cc
-       @echo =====debug======$(MT)== $<
-       @$(CXX) $(CXXFLAGS.g) $(CXXFLAGS) -c $< -o $@
-%.$(OBJEXT) : %.cc
-       @echo =====optimized==$(MT)== $<
-       @$(CXX) $(CXXFLAGS.o) $(CXXFLAGS) -c $< -o $@
-
-############################################################
-# Automatic generation of dependencies
-############################################################
-
-all-cc-files = $(shell echo *.cc)
-
-Makefile.depend: $(all-cc-files)
-       @echo =====Dependencies== Makefile.depend
-       @$(CXX) $(flags) $^ -M > $@
-       @$(PERL) -pi~ -e 's/(^[^.]+)\.$(OBJEXT):/\1.$(OBJEXT) \1.g.$(OBJEXT):/;' $@
-
-include Makefile.depend

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.