Commit e1383a3e authored by thomas.forbriger's avatar thomas.forbriger
Browse files

[TASK] (makepkg): set PACKAGENEEDSPGPLOT

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.

The new package installation mechanism requires additional variables be set.
parent 1940706e
......@@ -367,6 +367,8 @@ list-libraries:
# is delegated to Makefile.packages
ifdef TF_MAKEPKG
.PHONY: package
# export PACKAGELINKSFORTRAN=yes
# export PACKAGENEEDSPGPLOT=yes
package: $(TF_MAKEPKG)
$(MAKE) -f $< \
PACKAGE=convsff \
......
......@@ -50,8 +50,11 @@ $(LOCBINDIR)/%: %
# standard edit targets
.PHONY: clean edit
flist: *.f Makefile *.inc COPYING README
echo $^ | tr ' ' '\n' | sort > $@
EDITFILES=Makefile $(wildcard *.f *.inc) COPYING README
flist: Makefile $(wildcard *.f *.inc) COPYING README $(TF_EDIT)
echo $(EDITFILES) | tr ' ' '\n' | sort > $@
echo '----' >> $@
echo $(filter-out $(EDITFILES),$^) | tr ' ' '\n' | sort >> $@
edit: flist
vim $<
......@@ -125,6 +128,8 @@ list-libraries:
# is delegated to Makefile.packages
ifdef TF_MAKEPKG
.PHONY: package
# export PACKAGELINKSFORTRAN=yes
export PACKAGENEEDSPGPLOT=yes
package: $(TF_MAKEPKG)
$(MAKE) -f $< \
PACKAGE=disan \
......
......@@ -77,6 +77,8 @@ edit: flist ; vim flist
flist: *.f *.inc Makefile README COPYING\
README.PGPLOT.copyright.notice
echo $^ | tr ' ' '\n' | sort > $@
echo '----' >> $@
echo $(TF_EDIT) | tr ' ' '\n' | sort >> $@
#----------------------------------------------------------------------
GREBOBS=grepg.o grepg_message.o grepg_dopicks.o grepg_selstyle.o \
......@@ -101,6 +103,7 @@ grepg: $(GREBOBS)
# --------------
# is delegated to Makefile.packages
ifdef TF_MAKEPKG
# export PACKAGELINKSFORTRAN=yes
export PACKAGENEEDSPGPLOT=yes
.PHONY: package
package: $(TF_MAKEPKG)
......
......@@ -59,6 +59,8 @@ CPPFLAGS+=-I$(LOCINCLUDEDIR) $(FLAGS)
flist: Makefile README COPYING $(wildcard *.f *.inc)
echo $^ | tr ' ' '\n' | sort > $@
echo '----' >> $@
echo $(TF_EDIT) | tr ' ' '\n' | sort >> $@
.PHONY: edit
edit: flist; vim $<
......@@ -83,6 +85,8 @@ $(PROGRAMS): %: %.f
# --------------
# is delegated to Makefile.packages
ifdef TF_MAKEPKG
# PACKAGELINKSFORTRAN=yes
# PACKAGENEEDSPGPLOT=yes
.PHONY: package
package: $(TF_MAKEPKG)
$(MAKE) -f $< \
......
......@@ -94,6 +94,8 @@ CPPFLAGS+=$(addprefix -I,$(LOCINCLUDEDIR) $(subst :, ,$(SERVERINCLUDEDIR))) \
flist: Makefile $(HEADERS) $(SRC) doxydoc.cfg $(EXSRC) COPYING README
echo $^ | tr ' ' '\n' | sort > $@
echo '----' >> $@
echo $(TF_EDIT) | tr ' ' '\n' | sort >> $@
.PHONY: edit
edit: flist; vim $<
......@@ -224,6 +226,8 @@ doxyview: $(DOXYWWWPATH)/html/index.html
# --------------
ifdef TF_MAKEPKG
# export PACKAGELINKSFORTRAN=yes
export PACKAGENEEDSPGPLOT=yes
.PHONY: package
package: $(TF_MAKEPKG)
$(MAKE) -f $< \
......
......@@ -53,8 +53,11 @@ list-programs:
#----------------------------------------------------------------------
# standard edit targets
flist: Makefile COPYING README $(sort $(wildcard *.cc *.f *.inc)) $(TF_EDIT)
flist: Makefile COPYING README $(sort $(wildcard *.cc *.f *.inc))
echo $^ | tr ' ' '\n' > $@
echo '----' >> $@
echo $(TF_EDIT) | tr ' ' '\n' | sort >> $@
.PHONY: edit
edit: flist; vim $<
......@@ -175,6 +178,8 @@ planefield.ps: planefield.sff Makefile
# --------------
# is delegated to Makefile.packages
ifdef TF_MAKEPKG
# export PACKAGELINKSFORTRAN=yes
export PACKAGENEEDSPGPLOT=yes
.PHONY: package
package: $(TF_MAKEPKG)
$(MAKE) -f $< \
......
......@@ -31,8 +31,6 @@
F2CLIB=-lf2c -lm -L${SERVERLIBDIR}
F2CFLAGS=-f -u
PGPLOTF2CLIB=-l$(TF_f2c_PGPLOT) $(TF_LINK_PGPLOT)
PGPLOT77LIB=-l$(TF_g77_PGPLOT) $(TF_LINK_PGPLOT)
FORTRANLIB=$(TF_LINK_FORTRAN)
FLAGS += $(MYFLAGS)
......
......@@ -125,6 +125,8 @@ CPPFLAGS+=-I$(LOCINCLUDEDIR) $(FLAGS)
flist: Makefile $(wildcard *.f)
echo $^ | tr ' ' '\n' | sort > $@
echo '----' >> $@
echo $(TF_EDIT) | tr ' ' '\n' | sort >> $@
.PHONY: edit
edit: flist; vim $<
......@@ -173,5 +175,28 @@ chopmod: %: %.o
# gem2asc flamop flamops gemmodpg: %: %.o
# $(CC) -o $@ $< $(LIBEMOD) $(LIBTF) $(LIBPGPLOT) $(LIBF2C)
# newprog $@
#
#======================================================================
# create package
# --------------
### is delegated to Makefile.packages
##ifdef TF_MAKEPKG
##.PHONY: package
### PACKAGELINKSFORTRAN=yes
### PACKAGENEEDSPGPLOT=yes
##package: $(TF_MAKEPKG)
## $(MAKE) -f $< \
## PACKAGE=convsff \
## PACKAGEEXPORT="trunk/src/conv/sff:src" \
## PACKAGETARGETS="src:all" \
## PACKAGELIBS="-"
##.PHONY: fullpackage
##fullpackage: $(TF_MAKEPKG)
## $(MAKE) -f $< \
## PACKAGE=convsffwithlibs \
## PACKAGEEXPORT="trunk/src/conv/sff:src" \
## PACKAGETARGETS="src:all" \
## PACKAGELIBS="libsff libtf libsffu libts libaff libtime libgsexx libsffxx libdatrwxx libtfxx libtsxx"
##endif
##
# ----- END OF Makefile -----
......@@ -36,7 +36,6 @@ CHECKVARS=$(foreach var,$(1),$(call CHECKVAR,$(var)))
$(call CHECKVARS,LOCINCLUDEDIR LOCLIBDIR LOCBINDIR)
$(call CHECKVARS,TF_BROWSER TF_WWWBASEDIR)
$(call CHECKVARS,TF_LINK_PGPLOT TF_LINK_FORTRAN)
FLAGS += $(MYFLAGS)
CFLAGS += -O2 $(FLAGS)
......@@ -56,6 +55,8 @@ clean: ;
flist: $(wildcard *.f *.inc Makefile *.cc) doxydoc.cfg
echo $^ | tr ' ' '\n' | sort > $@
echo '----' >> $@
echo $(TF_EDIT) | tr ' ' '\n' | sort >> $@
.PHONY: edit
edit: flist; vim $<
......@@ -96,5 +97,28 @@ doxydoc: $(DOXYWWWPATH)/html/index.html
doxyview: $(DOXYWWWPATH)/html/index.html
$(TF_BROWSER) file:$< &
#
#======================================================================
# create package
# --------------
# is delegated to Makefile.packages
##ifdef TF_MAKEPKG
##.PHONY: package
### PACKAGELINKSFORTRAN=yes
### PACKAGENEEDSPGPLOT=yes
##package: $(TF_MAKEPKG)
## $(MAKE) -f $< \
## PACKAGE=convsff \
## PACKAGEEXPORT="trunk/src/conv/sff:src" \
## PACKAGETARGETS="src:all" \
## PACKAGELIBS="-"
##.PHONY: fullpackage
##fullpackage: $(TF_MAKEPKG)
## $(MAKE) -f $< \
## PACKAGE=convsffwithlibs \
## PACKAGEEXPORT="trunk/src/conv/sff:src" \
## PACKAGETARGETS="src:all" \
## PACKAGELIBS="libsff libtf libsffu libts libaff libtime libgsexx libsffxx libdatrwxx libtfxx libtsxx"
##endif
# ----- END OF Makefile -----
......@@ -45,6 +45,7 @@ CHECKVAR=$(if $($(1)),,$(error ERROR: missing variable $(1)))
CHECKVARS=$(foreach var,$(1),$(call CHECKVAR,$(var)))
$(call CHECKVARS,LOCINCLUDEDIR LOCLIBDIR LOCBINDIR)
$(call CHECKVARS,TF_LINK_PGPLOT)
LINLIB=-lblas -llapack
PGPLOTLIB=$(TF_LINK_PGPLOT)
......@@ -60,6 +61,8 @@ flist: $(EDITFILES) $(FIDAOBS:.o=.f) *.inc
echo $(EDITFILES) | tr ' ' '\n' | sort > $@
echo $(FIDAOBS:.o=.f) | tr ' ' '\n' | sort >> $@
echo *.inc | tr ' ' '\n' | sort >> $@
echo '----' >> $@
echo $(TF_EDIT) | tr ' ' '\n' | sort >> $@
edit: flist; vim $<
......@@ -118,6 +121,8 @@ list-libraries:
# --------------
# is delegated to Makefile.packages
ifdef TF_MAKEPKG
# export PACKAGELINKSFORTRAN=yes
export PACKAGENEEDSPGPLOT=yes
.PHONY: package
package: $(TF_MAKEPKG)
$(MAKE) -f $< \
......
......@@ -86,6 +86,8 @@ DIRS=-L$(SERVERLIBDIR) -L$(LOCLIBDIR) -I$(SERVERINCLUDEDIR) -I$(LOCINCLUDEDIR)
# standard edit targets
flist: Makefile $(wildcard *.f *.cc)
echo $^ | tr ' ' '\n' | sort > $@
echo '----' >> $@
echo $(TF_EDIT) | tr ' ' '\n' | sort >> $@
.PHONY: edit
edit: flist; vim $<
......@@ -119,6 +121,8 @@ damplox: %x: %.o
# --------------
# is delegated to Makefile.packages
ifdef TF_MAKEPKG
# export PACKAGELINKSFORTRAN=yes
export PACKAGENEEDSPGPLOT=yes
.PHONY: package
package: $(TF_MAKEPKG)
$(MAKE) -f $< \
......
......@@ -55,6 +55,8 @@ doc: functions.doc
# standard edit targets
flist: $(wildcard *.f sub/*.f include/*.inc) Makefile COPYING README
echo $^ | tr ' ' '\n' | sort > $@
echo '----' >> $@
echo $(TF_EDIT) | tr ' ' '\n' | sort >> $@
edit: flist
vim $<
......@@ -130,6 +132,8 @@ refractx: $(REFOBS)
# --------------
# is delegated to Makefile.packages
ifdef TF_MAKEPKG
# export PACKAGELINKSFORTRAN=yes
export PACKAGENEEDSPGPLOT=yes
.PHONY: package
package: $(TF_MAKEPKG)
$(MAKE) -f $< \
......
......@@ -49,6 +49,7 @@ CHECKVARS=$(foreach var,$(1),$(call CHECKVAR,$(var)))
$(call CHECKVARS,LOCINCLUDEDIR LOCLIBDIR LOCBINDIR)
$(call CHECKVARS,TF_BROWSER TF_WWWBASEDIR)
$(call CHECKVARS,TF_LINK_PGPLOT)
FLAGS += $(MYFLAGS) -fPIC
FFLAGS += -ff2c -Wall -ffixed-line-length-0 -fno-backslash $(FLAGS)
......@@ -62,6 +63,8 @@ CPPFLAGS+=$(addprefix -I,$(LOCINCLUDEDIR) $(subst :, ,$(SERVERINCLUDEDIR))) \
flist: Makefile COPYING README $(wildcard *.f *.inc)
echo $^ | tr ' ' '\n' | sort > $@
echo '----' >> $@
echo $(TF_EDIT) | tr ' ' '\n' | sort >> $@
.PHONY: edit
edit: flist; vim $<
......@@ -113,6 +116,8 @@ list-libraries:
# --------------
# is delegated to Makefile.packages
ifdef TF_MAKEPKG
# export PACKAGELINKSFORTRAN=yes
export PACKAGENEEDSPGPLOT=yes
.PHONY: package
package: $(TF_MAKEPKG)
$(MAKE) -f $< \
......
......@@ -73,6 +73,8 @@ OBJ=$(patsubst %.cc,%.o,$(SRC))
flist: Makefile $(wildcard *.cc *.h) README doxydoc.cfg \
$(filter-out %.bak, $(wildcard README.*))
echo $^ | tr ' ' '\n' | sort > $@
echo '----' >> $@
echo $(TF_EDIT) | tr ' ' '\n' | sort >> $@
.PHONY: edit
edit: flist; vim $<
......@@ -169,6 +171,8 @@ doxyview: $(DOXYWWWPATH)/html/index.html
# --------------
# is delegated to Makefile.packages
ifdef TF_MAKEPKG
export PACKAGELINKSFORTRAN=yes
export PACKAGENEEDSPGPLOT=yes
.PHONY: package
package: $(TF_MAKEPKG)
$(MAKE) -f $< \
......
......@@ -76,7 +76,7 @@ CHECKVAR=$(if $($(1)),,$(error ERROR: missing variable $(1)))
CHECKVARS=$(foreach var,$(1),$(call CHECKVAR,$(var)))
$(call CHECKVARS,LOCINCLUDEDIR LOCLIBDIR LOCBINDIR)
$(call CHECKVARS,TF_LINK_FORTRAN)
$(call CHECKVARS,TF_LINK_FORTRAN TF_LINK_PGPLOT)
FORTRANLIB=$(TF_LINK_FORTRAN)
......
Supports Markdown
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