Fixed regex makefiles to work nice with the new boost.test lib.

Added tentative VACPP fix.


[SVN r15300]
This commit is contained in:
John Maddock
2002-09-13 11:52:11 +00:00
parent f81bdae7f1
commit d9694bbc1f
10 changed files with 583 additions and 536 deletions

View File

@ -5,6 +5,10 @@
# Sun Workshop 6 and greater:
#
CXX= CC $(INCLUDES) -I../../../../ -I./ $(CXXFLAGS) -L../../build/sunpro $(LDFLAGS)
#
# sources to compile for each test:
#
SOURCES=tests.cpp parse.cpp regress.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
total : r rm r/regress rm/regress rs rms rs/regress rms/regress rw rmw rw/regress rmw/regress rsw rmsw rsw/regress rmsw/regress
echo testsing narrow character versions:
@ -22,45 +26,45 @@ total : r rm r/regress rm/regress rs rms rs/regress rms/regress rw rmw rw/regres
# delete the cache before each build.
# NB this precludes multithread builds:
#
r/regress : tests.cpp parse.cpp regress.cpp
r/regress : $(SOURCES)
rm -f *.o
rm -fr SunWS_cache
$(CXX) -O2 -o r/regress tests.cpp parse.cpp regress.cpp -lboost_regex$(LIBSUFFIX) $(LIBS)
$(CXX) -O2 -o r/regress $(SOURCES) -lboost_regex$(LIBSUFFIX) $(LIBS)
rm/regress : tests.cpp parse.cpp regress.cpp
rm/regress : $(SOURCES)
rm -f *.o
rm -fr SunWS_cache
$(CXX) -O2 -mt -o rm/regress tests.cpp parse.cpp regress.cpp -lboost_regex_mt$(LIBSUFFIX) $(LIBS)
$(CXX) -O2 -mt -o rm/regress $(SOURCES) -lboost_regex_mt$(LIBSUFFIX) $(LIBS)
rs/regress : tests.cpp parse.cpp regress.cpp
rs/regress : $(SOURCES)
rm -f *.o
rm -fr SunWS_cache
$(CXX) -O2 -o rs/regress tests.cpp parse.cpp regress.cpp -Bstatic -lboost_regex$(LIBSUFFIX) -Bdynamic $(LIBS)
$(CXX) -O2 -o rs/regress $(SOURCES) -Bstatic -lboost_regex$(LIBSUFFIX) -Bdynamic $(LIBS)
rms/regress : tests.cpp parse.cpp regress.cpp
rms/regress : $(SOURCES)
rm -f *.o
rm -fr SunWS_cache
$(CXX) -O2 -mt -o rms/regress tests.cpp parse.cpp regress.cpp -Bstatic -lboost_regex_mt$(LIBSUFFIX) -Bdynamic $(LIBS)
$(CXX) -O2 -mt -o rms/regress $(SOURCES) -Bstatic -lboost_regex_mt$(LIBSUFFIX) -Bdynamic $(LIBS)
rw/regress : tests.cpp parse.cpp regress.cpp
rw/regress : $(SOURCES)
rm -f *.o
rm -fr SunWS_cache
$(CXX) -O2 -DTEST_UNICODE -o rw/regress tests.cpp parse.cpp regress.cpp -lboost_regex$(LIBSUFFIX) $(LIBS)
$(CXX) -O2 -DTEST_UNICODE -o rw/regress $(SOURCES) -lboost_regex$(LIBSUFFIX) $(LIBS)
rmw/regress : tests.cpp parse.cpp regress.cpp
rmw/regress : $(SOURCES)
rm -f *.o
rm -fr SunWS_cache
$(CXX) -O2 -mt -DTEST_UNICODE -o rmw/regress tests.cpp parse.cpp regress.cpp -lboost_regex_mt$(LIBSUFFIX) $(LIBS)
$(CXX) -O2 -mt -DTEST_UNICODE -o rmw/regress $(SOURCES) -lboost_regex_mt$(LIBSUFFIX) $(LIBS)
rsw/regress : tests.cpp parse.cpp regress.cpp
rsw/regress : $(SOURCES)
rm -f *.o
rm -fr SunWS_cache
$(CXX) -O2 -DTEST_UNICODE -o rsw/regress tests.cpp parse.cpp regress.cpp -Bstatic -lboost_regex$(LIBSUFFIX) -Bdynamic $(LIBS)
$(CXX) -O2 -DTEST_UNICODE -o rsw/regress $(SOURCES) -Bstatic -lboost_regex$(LIBSUFFIX) -Bdynamic $(LIBS)
rmsw/regress : tests.cpp parse.cpp regress.cpp
rmsw/regress : $(SOURCES)
rm -f *.o
rm -fr SunWS_cache
$(CXX) -O2 -mt -DTEST_UNICODE -o rmsw/regress tests.cpp parse.cpp regress.cpp -Bstatic -lboost_regex_mt$(LIBSUFFIX) -Bdynamic $(LIBS)
$(CXX) -O2 -mt -DTEST_UNICODE -o rmsw/regress $(SOURCES) -Bstatic -lboost_regex_mt$(LIBSUFFIX) -Bdynamic $(LIBS)
r:
mkdir -p r
@ -127,5 +131,6 @@ clean: