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

merged remaining trunk changes

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/branches/su1
SVN Revision: 3699
SVN UUID:     67feda4a-a26e-11df-9d6e-31afc202ad0c
parents 609fff21 1fa56343
......@@ -30,7 +30,7 @@ edit: flist; vim $<
.PHONY: clean
clean: ;
-find . -name \*.bak | xargs --no-run-if-empty /bin/rm -v
-/bin/rm -vf flist
-/bin/rm -vf flist *.o *.d *.a
#======================================================================
FLAGS += $(MYFLAGS) -fPIC
......@@ -146,11 +146,14 @@ LIBOBS=$(patsubst %.cc,%.o,$(SRC))
libaff.a: $(INSTHEADER) $(LIBOBS)
ar rcv $@ $(LIBOBS)
ranlib $@
/bin/mv -vpf $@ $(LIBINSTALLPATH)
libdatrwxx.so: $(patsubst %.cc,%.o,$(LIBSRC))
$(CXX) $(CXXFLAGS) -shared -o $@ $^
/bin/mv -fpv $@ $(LOCLIBDIR)
LIBRARIES=libaff.a libdatrwxx.so
.PHONY: install
install: $(LIBRARIES)
/bin/mv -fv $^ $(LOCLIBDIR)
#======================================================================
# reinstall target
......
......@@ -49,8 +49,8 @@
.PHONY: all
all: install doxydoc
.PHONY: install
install: install-include libgremlin1xx.a
.PHONY: doc
doc: doxydoc
# check mandatory environment variable settings
# ---------------------------------------------
......@@ -138,7 +138,11 @@ LIBOBS=$(patsubst %.cc,%.o,$(SRC))
libgremlin1xx.a: install-include $(LIBOBS)
ar rcv $@ $(LIBOBS)
ranlib $@
/bin/mv -vf $@ $(LIBINSTALLPATH)
LIBRARIES=libgremlin1xx.a
.PHONY: install
install: $(LIBRARIES)
/bin/mv -vf $^ $(LIBINSTALLPATH)
#======================================================================
# dependencies
......
......@@ -39,11 +39,18 @@
# ============================================================================
#
all: install
.PHONY: all
all: install doc
.PHONY: install
install: libs
.PHONY: doc
doc: docs
libs: libginmod.a libgindat.a libgininv.a libginpar.a libginpg.a libgin.a \
LIBRARIES=libginmod.a libgindat.a libgininv.a libginpar.a libginpg.a libgin.a \
libginres.a
libs: $(LIBRARIES)
/bin/mv -fv $^ $(LOCLIBDIR)
# check mandatory environment variable settings
# ---------------------------------------------
......@@ -97,7 +104,7 @@ ALLOBS=$(PGOBS) $(PAROBS) $(MODOBS) $(DATOBS) $(INVOBS) $(RESOBS)
#----------------------------------------------------------------------
clean:
-/bin/rm *.o *.bak *.o77 *.d
-/bin/rm *.o *.bak *.o77 *.d *.a
#----------------------------------------------------------------------
......@@ -135,39 +142,16 @@ glq_dim.inc: glq_dimstd.inc; /bin/cp -v $< $@
-include $(patsubst %.f,%.d,$(wildcard *.f))
libginres.a: $(RESOBS)
ar rcv libginres.a $(RESOBS)
ranlib libginres.a
/bin/mv -fv $@ $(LOCLIBDIR)
libginmod.a: $(MODOBS)
ar rcv libginmod.a $(MODOBS)
ranlib libginmod.a
/bin/mv -fv $@ $(LOCLIBDIR)
libgindat.a: $(DATOBS)
ar rcv libgindat.a $(DATOBS)
ranlib libgindat.a
/bin/mv -fv $@ $(LOCLIBDIR)
libgininv.a: $(INVOBS)
ar rcv libgininv.a $(INVOBS)
ranlib libgininv.a
/bin/mv -fv $@ $(LOCLIBDIR)
libginpar.a: $(PAROBS)
ar rcv libginpar.a $(PAROBS)
ranlib libginpar.a
/bin/mv -fv $@ $(LOCLIBDIR)
libgin.a: $(PGOBS) $(PAROBS) $(MODOBS) $(DATOBS) $(INVOBS) $(RESOBS)
ar rcv libgin.a $(PGOBS) $(PAROBS) $(MODOBS) $(DATOBS) $(INVOBS) $(RESOBS)
ranlib libgin.a
/bin/mv -fv $@ $(LOCLIBDIR)
libginpg.a: $(PGOBS)
ar rcv libginpg.a $(PGOBS)
ranlib libginpg.a
/bin/mv -fv $@ $(LOCLIBDIR)
$(LIBRARIES): %.a:
ar rcv $@ $^
ranlib $@
allgremlin:
make libgin.a
......
......@@ -44,8 +44,16 @@
# ============================================================================
#
.PHONY: all
all: install
install: refmet librefread.a
PROGRAMS=refmet
LIBRARIES=librefread.a
.PHONY: install
install: $(PROGRAMS) $(LIBRARIES)
/bin/mv -fv $(PROGRAMS) $(LOCBINDIR)
/bin/mv -fv $(LIBRARIES) $(LOCLIBDIR)
#----------------------------------------------------------------------
# standard edit targets
......@@ -110,17 +118,14 @@ refmatsh: main/refmatsh.o $(addprefix sub/, $(REFMETOBS))
matbau: %: main/%.o
$(FC) $< -o $@ -L$(LOCLIBDIR)
/bin/mv -fv $@ $(LOCBINDIR)
grema: %: main/%.o sub/refmet_rrcv.o
$(FC) $(FFLAGS) $^ -o $@ -lrefread -ltf -lsff \
-L$(LOCLIBDIR)
/bin/mv -fv $@ $(LOCBINDIR)
refmatsh refmat resus refmet:
$(FC) $^ -o $@ -lsff -lemod -ltf \
-L$(LOCLIBDIR) $(FFLAGS)
/bin/mv -fv $@ $(LOCBINDIR)
refmetx:
$(FC) $^ -o $@ -lemod -ltf \
......@@ -131,12 +136,10 @@ refmetx:
resusnoise:
$(FC) $^ -o $@ -lsff -lemod -ltf -lgsl -lgslcblas \
-L$(LOCLIBDIR) $(FFLAGS)
/bin/mv -fv $@ $(LOCBINDIR)
librefread.a: $(LIBREFMETOBS)
ar rcv librefread.a $(LIBREFMETOBS)
ranlib librefread.a
/bin/mv -fv $@ $(LOCLIBDIR)
# ----- END OF Makefile -----
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