boostorg/regex
1
0
Fork 1
mirror of https://github.com/boostorg/regex.git synced 2025-07-30 12:37:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

More regex makefile updates (changed name to libboost_regex)

Browse Source 
[SVN r9486]
This commit is contained in:
John Maddock
2001-03-08 12:29:07 +00:00
parent 15142ddf9d
commit 9e6a7d8e5f
11 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -3553,7 +3553,7 @@ EOF
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
echo "$ac_t"" Warning - $0 has determined that your compiler can not merge" 1>&6 echo "$ac_t"" Warning - $0 has determined that your compiler can not merge" 1>&6
echo "$ac_t"" template instances, you may have problems linking to libregex++.a - " 1>&6 echo "$ac_t"" template instances, you may have problems linking to libboost_regex.a - " 1>&6
echo "$ac_t"" see the FAQ for further details." 1>&6 echo "$ac_t"" see the FAQ for further details." 1>&6
@ -3593,7 +3593,7 @@ EOF
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
echo "$ac_t"" Warning - $0 has determined that your compiler can not merge " 1>&6 echo "$ac_t"" Warning - $0 has determined that your compiler can not merge " 1>&6
echo "$ac_t"" template instances, if these are located inside an archive file," 1>&6 echo "$ac_t"" template instances, if these are located inside an archive file," 1>&6
echo "$ac_t"" you may have problems linking to libregex++.a - see the FAQ for" 1>&6 echo "$ac_t"" you may have problems linking to libboost_regex.a - see the FAQ for" 1>&6
echo "$ac_t"" further details." 1>&6 echo "$ac_t"" further details." 1>&6
@ -3737,7 +3737,7 @@ EOF
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
echo "$ac_t"" Warning - $0 has determined that your compiler can not merge" 1>&6 echo "$ac_t"" Warning - $0 has determined that your compiler can not merge" 1>&6
echo "$ac_t"" template instances, if those instances contain switch statements, " 1>&6 echo "$ac_t"" template instances, if those instances contain switch statements, " 1>&6
echo "$ac_t"" you may have problems linking to libregex++.a - " 1>&6 echo "$ac_t"" you may have problems linking to libboost_regex.a - " 1>&6
echo "$ac_t"" see the FAQ for further details." 1>&6 echo "$ac_t"" see the FAQ for further details." 1>&6

6
configure.in
View File

@ -1513,7 +1513,7 @@ AC_TRY_LINK(
[AC_DEFINE(BOOST_RE_NO_TEMPLATE_MERGE, []) [AC_DEFINE(BOOST_RE_NO_TEMPLATE_MERGE, [])
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
AC_MSG_RESULT([ Warning - $0 has determined that your compiler can not merge]) AC_MSG_RESULT([ Warning - $0 has determined that your compiler can not merge])
AC_MSG_RESULT([ template instances, you may have problems linking to libregex++.a - ]) AC_MSG_RESULT([ template instances, you may have problems linking to libboost_regex.a - ])
AC_MSG_RESULT([ see the FAQ for further details.]) AC_MSG_RESULT([ see the FAQ for further details.])
] ]
) )
@ -1536,7 +1536,7 @@ AC_TRY_LINK(
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
AC_MSG_RESULT([ Warning - $0 has determined that your compiler can not merge ]) AC_MSG_RESULT([ Warning - $0 has determined that your compiler can not merge ])
AC_MSG_RESULT([ template instances, if these are located inside an archive file,]) AC_MSG_RESULT([ template instances, if these are located inside an archive file,])
AC_MSG_RESULT([ you may have problems linking to libregex++.a - see the FAQ for]) AC_MSG_RESULT([ you may have problems linking to libboost_regex.a - see the FAQ for])
AC_MSG_RESULT([ further details.]) AC_MSG_RESULT([ further details.])
] ]
) )
@ -1663,7 +1663,7 @@ AC_TRY_LINK(
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
AC_MSG_RESULT([ Warning - $0 has determined that your compiler can not merge]) AC_MSG_RESULT([ Warning - $0 has determined that your compiler can not merge])
AC_MSG_RESULT([ template instances, if those instances contain switch statements, ]) AC_MSG_RESULT([ template instances, if those instances contain switch statements, ])
AC_MSG_RESULT([ you may have problems linking to libregex++.a - ]) AC_MSG_RESULT([ you may have problems linking to libboost_regex.a - ])
AC_MSG_RESULT([ see the FAQ for further details.]) AC_MSG_RESULT([ see the FAQ for further details.])
] ]
) )

4
demo/jgrep/gcc.mak
View File

@ -6,10 +6,10 @@
CXX= $(INCLUDES) -O2 -I../../../../ -I./ $(CXXFLAGS) $(LDFLAGS) 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++ $(LIBS) g++ -ojgrep $(CXX) jgrep.cpp main.cpp -L../../lib/gcc -lboost_regex $(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 $(LIBS) g++ -ojgrep -I../../../../ -I./ -g jgrep.cpp main.cpp -L../../lib/gcc -lboost_regex_debug $(LIBS)

4
demo/jgrep/makefile.in
View File

@ -8,10 +8,10 @@ LIBS=@LIBS@
EXE=@ac_exe_ext@ EXE=@ac_exe_ext@
OBJ=@ac_obj_ext@ OBJ=@ac_obj_ext@
LIBDEP=../../lib/libregex++.a ../../../../boost/re_detail/regex_options.hpp ../../../../boost/re_detail/regex_config.hpp LIBDEP=../../lib/libboost_regex.a ../../../../boost/re_detail/regex_options.hpp ../../../../boost/re_detail/regex_config.hpp
jgrep$(EXE) : jgrep$(OBJ) main$(OBJ) jgrep$(EXE) : jgrep$(OBJ) main$(OBJ)
$(CXX) -o jgrep$(EXE) jgrep$(OBJ) main$(OBJ) -L../../lib -lregex++ $(LIBS) $(CXX) -o jgrep$(EXE) jgrep$(OBJ) main$(OBJ) -L../../lib -lboost_regex $(LIBS)
jgrep$(OBJ) : jgrep.cpp jgrep.h $(LIBDEP) jgrep$(OBJ) : jgrep.cpp jgrep.h $(LIBDEP)
$(CXX) -c $(CXXFLAGS) -I../../../../ -I./ jgrep.cpp $(CXX) -c $(CXXFLAGS) -I../../../../ -I./ jgrep.cpp

4
demo/regress/gcc.mak
View File

@ -9,10 +9,10 @@ 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++ $(LIBS) $(CXX) -O2 -o r2 tests.cpp parse.cpp regress.cpp -lboost_regex $(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 $(LIBS) $(CXX) -g -o r2 tests.cpp parse.cpp regress.cpp -lboost_regex_debug $(LIBS)

4
demo/regress/makefile.in
View File

@ -3,13 +3,13 @@
# #
CXX=@CXX@ CXX=@CXX@
CXXFLAGS=@CXXFLAGS@ -I../../../../ CXXFLAGS=@CXXFLAGS@ -I../../../../
LIBS=@LIBS@ -L../../lib -lregex++ LIBS=@LIBS@ -L../../lib -lboost_regex
EXE=@ac_exe_ext@ EXE=@ac_exe_ext@
OBJ=@ac_obj_ext@ OBJ=@ac_obj_ext@
total : @ac_regress@ total : @ac_regress@
LIBDEP=../../lib/libregex++.a ../../../../boost/re_detail/regex_options.hpp ../../../../boost/re_detail/regex_config.hpp LIBDEP=../../lib/libboost_regex.a ../../../../boost/re_detail/regex_options.hpp ../../../../boost/re_detail/regex_config.hpp
r1$(EXE) :: tests.cpp parse.cpp regress.cpp r1$(EXE) :: tests.cpp parse.cpp regress.cpp
$(CXX) -o r1$(EXE) $(CXXFLAGS) tests.cpp parse.cpp regress.cpp $(LIBS) $(CXX) -o r1$(EXE) $(CXXFLAGS) tests.cpp parse.cpp regress.cpp $(LIBS)

4
demo/timer/gcc.mak
View File

@ -6,10 +6,10 @@
CXX= $(INCLUDES) -I../../../../ -I./ $(CXXFLAGS) CXX= $(INCLUDES) -I../../../../ -I./ $(CXXFLAGS)
timer : regex_timer.cpp timer : regex_timer.cpp
g++ $(CXX) -O2 -o timer regex_timer.cpp -L../../lib/gcc $(LDFLAGS) -lregex++ $(LIBS) g++ $(CXX) -O2 -o timer regex_timer.cpp -L../../lib/gcc $(LDFLAGS) -lboost_regex $(LIBS)
debug : regex_timer.cpp timer.cpp debug : regex_timer.cpp timer.cpp
g++ $(CXX) -g -o timer regex_timer.cpp -L../../lib/gcc $(LDFLAGS) -lregex++debug $(LIBS) g++ $(CXX) -g -o timer regex_timer.cpp -L../../lib/gcc $(LDFLAGS) -lboost_regex_debug $(LIBS)

4
demo/timer/makefile.in
View File

@ -7,10 +7,10 @@ LIBS=@LIBS@
EXE=@ac_exe_ext@ EXE=@ac_exe_ext@
OBJ=@ac_obj_ext@ OBJ=@ac_obj_ext@
LIBDEP=../../lib/libregex++.a ../../../../boost/re_detail/regex_options.hpp ../../../../boost/re_detail/regex_config.hpp LIBDEP=../../lib/libboost_regex.a ../../../../boost/re_detail/regex_options.hpp ../../../../boost/re_detail/regex_config.hpp
regex_timer$(EXE) : regex_timer$(OBJ) regex_timer$(EXE) : regex_timer$(OBJ)
$(CXX) -o timer$(EXE) regex_timer$(OBJ) -L../../lib -lregex++ $(LIBS) $(CXX) -o timer$(EXE) regex_timer$(OBJ) -L../../lib -lboost_regex $(LIBS)
regex_timer$(OBJ) : regex_timer.cpp $(LIBDEP) regex_timer$(OBJ) : regex_timer.cpp $(LIBDEP)
$(CXX) -c $(CXXFLAGS) -DSTRICT -I../../../../ -I./ regex_timer.cpp $(CXX) -c $(CXXFLAGS) -DSTRICT -I../../../../ -I./ regex_timer.cpp

2
lib/makefile.in
View File

@ -1,5 +1,5 @@
LIBNAME=regex++ LIBNAME=boost_regex
CPP=@CXX@ CPP=@CXX@
AR=ar AR=ar

3
lib/makefile.org
View File

@ -1,5 +1,5 @@
LIBNAME=regex++ LIBNAME=boost_regex
CPP=@CXX@ CPP=@CXX@
AR=ar AR=ar
@ -16,3 +16,4 @@ lib$(LIBNAME).a : $(ALL_O)

4
makefile.in
View File

@ -1,9 +1,9 @@
ALL_DEP=@ac_all_dep@ ALL_DEP=@ac_all_dep@
base: ./lib/libregex++.a base: ./lib/libboost_regex.a
./lib/libregex++.a: $(ALL_DEP) ./lib/libboost_regex.a: $(ALL_DEP)
sh dmi.sh lib sh dmi.sh lib