Merge branch 'master' into HEAD

This is a legacy commit from before 2015-03-01.
It may be incomplete as well as inconsistent.
See COPYING.legacy and README.history for details.

1548947 2014-01-21 17:07:28 +0100 Thomas Forbriger <Thomas.Forbriger@kit.edu>
 gitsvnalign: present log record first
 scr/util/git/gitsvnalign | 2 ++
 1 file changed, 2 insertions(+)

016e947 2014-01-21 16:07:51 +0100 Thomas Forbriger <Thomas.Forbriger@kit.edu>
 marked accounts to be disabled
 texts/accounts.txt | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

9942d45 2014-01-21 16:03:15 +0100 Thomas Forbriger <Thomas.Forbriger@kit.edu>
 accounts active as of 21.1.2014
 texts/accounts.txt | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

eda95bc 2014-01-21 13:20:43 +0100 Thomas Forbriger <Thomas.Forbriger@kit.edu>
 added TF_EDIT to TFbashrc
 src/TFbashrc | 6 ++++++
 1 file changed, 6 insertions(+)

a10ee63 2014-01-19 10:50:13 +0000 tforb <tforb@67feda4a-a26e-11df-9d6e-31afc202ad0c>
 new helper script
 scr/util/git/gitsvnalign | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

6047799 2014-01-08 22:03:44 +0000 tmetz <tmetz@67feda4a-a26e-11df-9d6e-31afc202ad0c>
 removed Flags
 src/green/gremlin1/cxx/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

SVN Path:     http://gpitrsvn.gpi.uni-karlsruhe.de/repos/TFSoftware/trunk
SVN Revision: 5503
SVN UUID:     67feda4a-a26e-11df-9d6e-31afc202ad0c

src/TFbashrc

@@ -20,6 +20,7 @@
 #    18/09/2010   V1.1   use only TF_WWWBASEDIR (not WWWBASEDIR)
 #                        use only TF_REMCMMNT (not REMCMMNT)
 #    13/10/2010   V1.2   add MATLABBINDIR
+#    21/01/2011   V1.3   add TF_EDIT
 # 
 # ============================================================================
 #
@@ -121,6 +122,11 @@ export TF_PUBLICATIONPATH=$HOME/public_html/download/software
 # this should be set only for package maintainers
 #export TF_MAKEPKG=$HOME/work/src/pakete/Makefile.packages
 
+# used for make edit rules, if desired
+#export TF_EDIT="$HOME/work/src/Makefile.buildingblocks \
+#    $HOME/work/src/README.dependencies \
+#    $HOME/git/TFSoftware/texts/thof/*.txt"
+
 # ----------------------------------------------------------------------------
 
 # execution path and man path

src/green/gremlin1/cxx/Makefile

@@ -156,7 +156,7 @@ install: $(LOCLIBDIR)
 # The compiler is used to create dependency files, which are included below.
 
 %.d: %.cc
-	$(SHELL) -ec '$(CXX) -M $(CPPFLAGS) $(TMPPARDEF) $< \
+	$(SHELL) -ec '$(CXX) -M  $(TMPPARDEF) $< \
       | sed '\''s,\($(notdir $*)\)\.o[ :]*,$(dir $@)\1.o $@ : ,g'\'' \
         > $@; \
       [ -s $@ ] || rm -f $@'