Commit 846061f9 authored by hrchilds's avatar hrchilds

Fix more $INCLUDE problems, like the one described in R7202.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@7218 18c085ea-50e0-402c-830e-de6fd14e8384
parent 304267cb
......@@ -43,6 +43,11 @@
# Brad Whitlock, Wed Nov 21 10:12:06 PST 2007
# Added testvcl program.
#
# Hank Childs, Wed May 6 08:41:19 PDT 2009
# Remove reference to $INCLUDE, which is not a variable that our configure
# script uses. It was working in most places, because it was not defined,
# but TACC's machines define INCLUDE as an environment variable.
#
##############################################################################
##
......@@ -79,16 +84,16 @@ clean:
## Other targets...
##
$(tmpbin)/vcl: $(LIBDEP) $(OBJ)
$(CXX) $(INCLUDE) -o $@ $(LDFLAGS) $(OBJ) $(LIBS)
$(CXX) -o $@ $(LDFLAGS) $(OBJ) $(LIBS)
$(tmpbin)/testvcl: $(LIBDEP) $(TESTOBJ)
$(CXX) $(INCLUDE) -o $@ $(LDFLAGS) $(TESTOBJ) -lvclproxy -lproxybase $(LIBS)
$(CXX) -o $@ $(LDFLAGS) $(TESTOBJ) -lvclproxy -lproxybase $(LIBS)
purify: $(LIBDEP) $(OBJ)
purify $(CXX) $(INCLUDE) -o $(tmpbin)/vcl $(LDFLAGS) $(OBJ) $(LIBS)
purify $(CXX) -o $(tmpbin)/vcl $(LDFLAGS) $(OBJ) $(LIBS)
quantify: $(LIBDEP) $(OBJ)
quantify $(CXX) $(INCLUDE) -o $(tmpbin)/vcl $(LDFLAGS) $(OBJ) $(LIBS)
quantify $(CXX) -o $(tmpbin)/vcl $(LDFLAGS) $(OBJ) $(LIBS)
install_bin: $(tmpbin)/vcl
$(INSTALL) $(tmpbin)/vcl $(bindir)
......
......@@ -270,16 +270,16 @@ clean:
## Other targets...
##
$(tmpbin)/mdserver: $(LIBDEP) $(OBJ)
$(CXX) $(INCLUDE) -o $@ $(LDFLAGS) $(OBJ) $(LIBS)
$(CXX) -o $@ $(LDFLAGS) $(OBJ) $(LIBS)
purify: $(LIBDEP) $(OBJ)
purify -cache-dir=$(TOPDIR)/lib -always-use-cache-dir $(CXX) $(INCLUDE) -o $(tmpbin)/mdserver $(LDFLAGS) $(OBJ) $(LIBS)
purify -cache-dir=$(TOPDIR)/lib -always-use-cache-dir $(CXX) -o $(tmpbin)/mdserver $(LDFLAGS) $(OBJ) $(LIBS)
quantify: $(LIBDEP) $(OBJ)
quantify $(CXX) $(INCLUDE) -o $(tmpbin)/mdserver $(LDFLAGS) $(OBJ) $(LIBS)
quantify $(CXX) -o $(tmpbin)/mdserver $(LDFLAGS) $(OBJ) $(LIBS)
$(tmpbin)/testmds: $(LIBDEP) $(TESTOBJ)
$(CXX) $(INCLUDE) -o $@ $(LDFLAGS) $(TESTOBJ) $(LIBS) -lmdserverproxy -lproxybase
$(CXX) -o $@ $(LDFLAGS) $(TESTOBJ) $(LIBS) -lmdserverproxy -lproxybase
install_bin: $(tmpbin)/mdserver
$(INSTALL) $(tmpbin)/mdserver $(bindir)
......
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