updated makefile responds to environment

[SVN r9395]
This commit is contained in:
John Maddock
2001-03-03 11:35:37 +00:00
parent f414a067b8
commit db6b4db44d
2 changed files with 8 additions and 6 deletions

View File

@ -3,13 +3,14 @@
# #
# GNU compiler g++ # GNU compiler g++
# #
CXX= -O2 -I../../../../ -I./ CXX= $(INCLUDES) -O2 -I../../../../ -I./ $(CXXFLAGS) $(LDFLAGS)
jgrep : jgrep.cpp main.cpp jgrep : jgrep.cpp main.cpp
g++ -ojgrep $(CXX) jgrep.cpp main.cpp -L../../lib/gcc -lregex++ g++ -ojgrep $(CXX) jgrep.cpp main.cpp -L../../lib/gcc -lregex++ $(LIBS)
debug : jgrep.cpp main.cpp debug : jgrep.cpp main.cpp
g++ -ojgrep -I../../../../ -I./ -g jgrep.cpp main.cpp -L../../lib/gcc -lregex++debug g++ -ojgrep -I../../../../ -I./ -g jgrep.cpp main.cpp -L../../lib/gcc -lregex++debug $(LIBS)

View File

@ -3,16 +3,17 @@
# #
# g++ 2.95 and greater # g++ 2.95 and greater
# #
CXX= g++ -pedantic -Wall -I../../../../ -I./ -L../../lib/gcc CXX= g++ $(INCLUDES) -pedantic -Wall -I../../../../ -I./ $(CXXFLAGS) -L../../lib/gcc $(LDFLAGS)
total : r2 total : r2
./r2 tests.txt ./r2 tests.txt
r2 : tests.cpp parse.cpp regress.cpp r2 : tests.cpp parse.cpp regress.cpp
$(CXX) -O2 -o r2 tests.cpp parse.cpp regress.cpp -lregex++ $(CXX) -O2 -o r2 tests.cpp parse.cpp regress.cpp -lregex++ $(LIBS)
debug : tests.cpp parse.cpp regress.cpp debug : tests.cpp parse.cpp regress.cpp
$(CXX) -g -o r2 tests.cpp parse.cpp regress.cpp -lregex++debug $(CXX) -g -o r2 tests.cpp parse.cpp regress.cpp -lregex++debug $(LIBS)