[WP] (incdirs): properply expand server path variables

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.

fixed in
 - ts/misc
 - ts/strom
 - ts/stuploxx
 - ts/wf

src/ts/stuploxx/Makefile

@@ -63,8 +63,6 @@ LDFLAGS=$(addprefix -L,$(LOCLIBDIR) $(subst :, ,$(SERVERLIBDIR))) $(STATIC)
 CPPFLAGS=$(addprefix -I,$(LOCINCLUDEDIR) $(subst :, ,$(SERVERINCLUDEDIR))) \
   $(FLAGS)
 
-DIRS=-L$(SERVERLIBDIR) -L$(LOCLIBDIR) -I$(SERVERINCLUDEDIR) -I$(LOCINCLUDEDIR)
-
 SRC=$(wildcard *.cc)
 OBJ=$(patsubst %.cc,%.o,$(SRC))
 

src/ts/wf/Makefile

@@ -80,15 +80,14 @@ $(call CHECKVARS,TF_LINK_FORTRAN)
 
 FORTRANLIB=$(TF_LINK_FORTRAN)
 
-FLAGS += $(MYFLAGS)
-CFLAGS += -O2 -I${SERVERINCLUDEDIR} -I${LOCINCLUDEDIR} $(FLAGS)
-FFLAGS += -ff2c -Wall -ffixed-line-length-0 -fno-backslash $(FLAGS)
-
 # use STATIC=-static to produce statically linked binaries
 STATIC=
+FLAGS += $(MYFLAGS)
+CPPFLAGS=$(addprefix -I,$(LOCINCLUDEDIR) $(subst :, ,$(SERVERINCLUDEDIR))) \
+  $(FLAGS)
+FFLAGS += -ff2c -Wall -ffixed-line-length-0 -fno-backslash $(FLAGS)
 CXXFLAGS+=-Wall $(FLAGS)
-LDFLAGS+=$(addprefix -L,$(LOCLIBDIR) $(subst :, ,$(SERVERLIBDIR)))
-CPPFLAGS+=-I$(LOCINCLUDEDIR) $(FLAGS)
+LDFLAGS=$(addprefix -L,$(LOCLIBDIR) $(subst :, ,$(SERVERLIBDIR))) $(STATIC)
 
 #----------------------------------------------------------------------
 # standard edit targets