[Firebird-checkins] CVS: firebird2/src/make.new Makefile.in.firebird,1.14,1.15 Makefile.in.gpre,1.10,1.11 make.rules,1.14,1.15

[Mark O. <sky...@us...>]

Update of /cvsroot/firebird/firebird2/src/make.new
In directory usw-pr-cvs1:/tmp/cvs-serv24618/src/make.new

Modified Files:
	Makefile.in.firebird Makefile.in.gpre make.rules 
Log Message:
Changes for rebuild of fb2.


Index: Makefile.in.firebird
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/make.new/Makefile.in.firebird,v
retrieving revision 1.14
retrieving revision 1.15
diff -U3 -r1.14 -r1.15
--- Makefile.in.firebird	16 Feb 2002 02:21:27 -0000	1.14
+++ Makefile.in.firebird	4 Jul 2002 09:34:19 -0000	1.15
@@ -64,7 +64,6 @@
 
 .PHONY: firebird super_firebird $(dirs)
 
-
 firebird: updateBuildNum phase1 phase2 phase3
 
 

Index: Makefile.in.gpre
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/make.new/Makefile.in.gpre,v
retrieving revision 1.10
retrieving revision 1.11
diff -U3 -r1.10 -r1.11
--- Makefile.in.gpre	24 Jun 2002 13:59:57 -0000	1.10
+++ Makefile.in.gpre	4 Jul 2002 09:34:19 -0000	1.11
@@ -43,7 +43,7 @@
 
 GPRECommon_Sources = cmd.cpp cme.cpp cmp.cpp c_cxx.cpp exp.cpp gpre.cpp \
 		hsh.cpp int.cpp int_cxx.cpp jrdmet.cpp movg.cpp msc.cpp par.cpp \
-		pat.cpp pretty.cpp sqe.cpp sql.cpp noform.cpp
+		pat.cpp pretty.cpp sqe.cpp sql.cpp cob.cpp noform.cpp
 
 GPREBoot_Sources=  gpre_meta_boot.cpp ../common/fb_exception.cpp
 GPRE_Sources=	   gpre_meta.cpp

Index: make.rules
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/make.new/make.rules,v
retrieving revision 1.14
retrieving revision 1.15
diff -U3 -r1.14 -r1.15
--- make.rules	23 Jun 2002 19:51:30 -0000	1.14
+++ make.rules	4 Jul 2002 09:34:19 -0000	1.15
@@ -144,9 +144,11 @@
 #  This is something that we should pick up with autoconf.
 #ReadlineLibs = -lreadline -ltermcap
 #ReadlineLibs = -lreadline -lncurses
-ReadlineLibs = -lreadline
-LINK_LIBS= -lm -lstdc++ $(ReadlineLibs) -lc -ldl -lcrypt
-STATICLINK_LIBS = -lm -lstdc++ $(ReadlineLibs) -lc -ldl -lcrypt
+#ReadlineLibs:= -lreadline
+#LINK_LIBS:= -lm -lstdc++ $(ReadlineLibs) @LIBS@ -lc -ldl -lcrypt
+#STATICLINK_LIBS := -lm -lstdc++ $(ReadlineLibs) -lc -ldl -lcrypt
+LINK_LIBS = @LIBS@
+STATICLINK_LIBS = @LIBS@
 
 #LINK_LIBS= -L$(LIB)  -lgds -lm -lc -ldl -lcrypt
 # -lgcc