Commit b63c09f5 authored by thomas.forbriger's avatar thomas.forbriger Committed by thomas.forbriger
Browse files

proceeding with migration

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.


SVN Path:     http://gpitrsvn.gpi.uni-karlsruhe.de/repos/TFSoftware/trunk
SVN Revision: 2477
SVN UUID:     67feda4a-a26e-11df-9d6e-31afc202ad0c
parent 68ff4625
# this is <Makefile>
# ----------------------------------------------------------------------------
# $Id: Makefile,v 1.20 2007-12-07 08:14:44 tforb Exp $
# $Id: Makefile,v 1.21 2007-12-13 10:11:15 tforb Exp $
#
# Copyright (c) 2003 by Thomas Forbriger (BFO Schiltach)
#
......@@ -77,7 +77,7 @@ INCSRC=sffxx.h sffostream.h
libsffxx.a: $(patsubst %.cc,%.o,$(LIBSRC))
ar rcv $@ $^
ranlib $@
/bin/mv -fv $@ $(LIBLOCDIR)
/bin/mv -fv $@ $(LOCLIBDIR)
#----------------------------------------------------------------------
# header files
......
......@@ -3,7 +3,7 @@
*
* ----------------------------------------------------------------------------
*
* $Id: regexx.cc,v 1.2 2007-12-05 14:04:31 tforb Exp $
* $Id: regexx.cc,v 1.3 2007-12-13 10:11:15 tforb Exp $
* \author Thomas Forbriger
* \date 05/12/2007
*
......@@ -29,18 +29,23 @@
*
* REVISIONS and CHANGES
* - 05/12/2007 V1.0 Thomas Forbriger
* - 13/12/2007 V1.1 traditional regexx.hh uses namespace regexx too
* use explicit root reference for namespace
*
* ============================================================================
*/
#define TF_REGEXX_CC_VERSION \
"TF_REGEXX_CC V1.0 "
"TF_REGEXX_CC V1.1"
#define TF_REGEXX_CC_CVSID \
"$Id: regexx.cc,v 1.2 2007-12-05 14:04:31 tforb Exp $"
"$Id: regexx.cc,v 1.3 2007-12-13 10:11:15 tforb Exp $"
#include <tfxx/regexx.h>
#ifdef OLDLIBREGEXX
#include<regexx.hh>
#ifndef REGEXX_HH
#error read wrong header
#endif
#else
#include<boost/regex.hpp>
#endif
......@@ -62,7 +67,6 @@ namespace tfxx {
// use old libregexx
#ifdef OLDLIBREGEXX
/*! we need a helper class to hide the internals.
*
* delegate everything to the container class.
......@@ -93,7 +97,7 @@ namespace tfxx {
return (Mregex.exec());
}
private:
regexx::Regexx Mregex;
::regexx::Regexx Mregex;
}; // class myregexxcontainer
/*======================================================================*/
......
# this is <Makefile>
# ----------------------------------------------------------------------------
# Makefile for work/src/libs/libtime
# ($Id: Makefile,v 2.32 2007-12-07 10:20:14 tforb Exp $)
# ($Id: Makefile,v 2.33 2007-12-13 10:11:15 tforb Exp $)
#
# how to build all flavours of libtime
#
......@@ -35,6 +35,10 @@
# 04/04/2006 V1.6 provide global FLAGS
# 05/12/2007 V1.7 migration to fenoglio with new environment variables
# and new Fortan compilation default: g77
# 13/12/2007 V1.8 renamed target: install-include and corrected
# installation command for header files
# libtime_trad.a is continued
# timeutil.h is still needed by some programs
#
# ============================================================================
#
......@@ -74,7 +78,7 @@ LIBF2CSFFU=-lf2csffu -L$(LOCLIBDIR)
endif
all: install doc example exectests
install: install-headers libraries
install: install-include libraries
doc: doxyview libtime.doc
example: tests/example++; tests/example++
exectests: tests
......@@ -125,7 +129,7 @@ CTESTS= tests/ctlibtime.c tests/timer.c tests/timeutil.c
FTESTS= tests/testlibtime.f tests/ttime_read.f
CXXTESTS=tests/testtime++.cc tests/example++.cc
HEADERS=libtime.h libtime++.h
HEADERS=libtime.h libtime++.h timeutil.h
ALLCODE=$(KERNEL) $(FCODE) $(FHANDLER) $(CWRAPPER) $(CCODE) $(CHANDLER) \
$(CXXCODE) $(CTESTS) $(FTESTS) $(CXXTESTS) timeutil.c \
......@@ -184,7 +188,7 @@ endif
#
# misc targets
# ------------
.PHONY: clean edit install-headers
.PHONY: clean edit install-include
clean:
find . \( -name \*.bak -o -name \*.o -o -name \*.o77 -o -name \*.d \) | \
......@@ -198,7 +202,8 @@ flist: $(KERNEL) $(FCODE) $(CWRAPPER) $(CCODE) Makefile $(README) \
edit: flist; vim $<
install-headers: $(HEADERS) ; /bin/ln -sf $^ $(LOCINCLUDEDIR)
install-include: $(HEADERS)
/bin/ln -sfv $(addprefix $(shell pwd)/,$^) $(LOCINCLUDEDIR)
#======================================================================
#
......@@ -217,13 +222,17 @@ libtime.a: $(patsubst %.f,%.o,$(KERNEL) $(FCODE) $(FHANDLER))
# pure FORTRAN libtime (f77 version)
libtime77.a: $(patsubst %.f,%.o77,$(KERNEL) $(FCODE) $(FHANDLER))
else
libraries: libtime.a libf2ctime.a libctime.a libtime++.a
libraries: libtime_trad.a libtime.a libf2ctime.a libctime.a libtime++.a
# pure FORTRAN libtime (g77 version)
libtime.a: $(patsubst %.f,%.o,$(KERNEL) $(FCODE) $(FHANDLER))
# pure FORTRAN libtime (f2c version)
libf2ctime.a: $(patsubst %.f,%.f2c.o,$(KERNEL) $(FCODE) $(FHANDLER))
# traditional libtime
libtime_trad.a: $(patsubst %.f,%.o,$(KERNEL) $(FCODE) $(FHANDLER)) \
$(patsubst %.c,%.o,$(CWRAPPER) $(CCODE)) timeutil.o
endif
# pure C libtime
......
......@@ -24,6 +24,8 @@ c REVISIONS and CHANGES
c
c 12/05/1997 V1.00 Thomas Forbriger (IfG Stuttgart)
c 27/06/1997 V1.01 some new routines
c 13/12/2007 V1.02 modifications to ts_linint to satisfy compiler
c ts_linint is not yet implemented
c
c======================================================================
cS
......@@ -49,7 +51,7 @@ c returns the actual version number
c
cE
real version
version=1.01
version=1.02
ts_libversion=version
return
end
......@@ -142,8 +144,9 @@ c
real data(n)
real dt, tanf, t
cE
double precision deltat
c double precision deltat
print *,'OH not yet implemented in libts.f'
ts_linint=0.
return
end
cS
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment