firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 20:43:02 +01:00
Code Issues

Changed makefiles to only use .o files drop the .lo files

Browse Source 
Change security.epp to use isc4.gdb rather than original isc.gdb
This commit is contained in:
skywalker 2001-08-06 15:08:18 +00:00
parent 94abf7c1b9
commit 13d14ab8a5
6 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/make.new/Makefile.in.dudley
View File

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.dudley,v 1.2 2001-08-01 08:11:52 skywalker Exp $ # $Id: Makefile.in.dudley,v 1.3 2001-08-06 15:08:18 skywalker Exp $
# #
ROOT=../.. ROOT=../..
@ -65,7 +65,7 @@ $(BIN)/gdef: $(DUDLEY_Objects) $(LIBGDS_LA)
$(SRC)/exe.cpp $(SRC)/extract.epp: yachts.lnk $(SRC)/exe.cpp $(SRC)/extract.epp: yachts.lnk
yachts.lnk: yachts.lnk:
ln -fs (SRC_ROOT)/refDatabases/empty.gdb yachts.lnk ln -fs $(SRC_ROOT)/refDatabases/empty.gdb yachts.lnk
-include $(Dependencies) -include $(Dependencies)

4
src/make.new/Makefile.in.intl
View File

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.intl,v 1.2 2001-08-01 08:11:52 skywalker Exp $ # $Id: Makefile.in.intl,v 1.3 2001-08-06 15:08:18 skywalker Exp $
# #
ROOT=../.. ROOT=../..
@ -68,7 +68,7 @@ INTL_DIR = $(FIREBIRD)/intl
intl: $(LIBGDSINTL_LA) intl: $(LIBGDSINTL_LA)
$(LIBGDSINTL_LA) : $(INTL_Objects1) $(LIBGDSINTL_LA) : $(INTL_Objects1)
$(LIB_LINK) $(LIB_LINK_OPTIONS) -o$(LIBGDSINTL_LA) $(^:.o=.lo) $(LIB_LINK) $(LIB_LINK_OPTIONS) -o$(LIBGDSINTL_LA) $^
# In the original there was a few quite involved things being done to make # In the original there was a few quite involved things being done to make

4
src/make.new/Makefile.in.jrd
View File

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.jrd,v 1.4 2001-08-04 22:48:18 bellardo Exp $ # $Id: Makefile.in.jrd,v 1.5 2001-08-06 15:08:18 skywalker Exp $
# #
ROOT=../.. ROOT=../..
@ -99,7 +99,7 @@ jrdlib_main : $(LIBGDS_LA)
$(LIBGDS_SO) : $(GDSLIB_Objects) $(LIBGDS_SO) : $(GDSLIB_Objects)
$(LIB_LINK) $(LIB_LINK_OPTIONS) -o $@ $(GDSLIB_SharedObjects) $(LIB_LINK) $(LIB_LINK_OPTIONS) -o $@ $^
$(LIBGDS_A) : $(GDSLIB_Objects) $(LIBGDS_A) : $(GDSLIB_Objects)
$(STATICLIB_LINK) $(LIB_LINK_OPTIONS) $@ $^ $(STATICLIB_LINK) $(LIB_LINK_OPTIONS) $@ $^

7
src/make.new/Makefile.in.utilities
View File

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.utilities,v 1.4 2001-08-01 08:11:52 skywalker Exp $ # $Id: Makefile.in.utilities,v 1.5 2001-08-06 15:08:18 skywalker Exp $
# #
ROOT=../.. ROOT=../..
@ -233,7 +233,9 @@ $(GDS_RELAY): $(RELAY_Objects) $(LIBGDS_LA)
$(CHMOD_7) $@ $(CHMOD_7) $@
# Eventually this one wants to be a $(GEN_SRC)/dba.cpp # Eventually these two want to be a $(GEN_SRC)/dba.cpp
#$(SRC)/security.cpp : isc4.gdb
$(SRC)/dba.cpp: yachts.lnk $(SRC)/dba.epp $(SRC)/dba.cpp: yachts.lnk $(SRC)/dba.epp
@ -241,6 +243,7 @@ yachts.lnk:
ln -fs $(SRC_ROOT)/refDatabases/empty.gdb yachts.lnk ln -fs $(SRC_ROOT)/refDatabases/empty.gdb yachts.lnk
# I was hoping one of these was going to allow me to compile security.epp # I was hoping one of these was going to allow me to compile security.epp
# without reference to an actual database, I heard it was possible with an # without reference to an actual database, I heard it was possible with an
# options but haven't found it yet. I'll leave these here it case others # options but haven't found it yet. I'll leave these here it case others

18
src/make.new/make.rules
View File

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: make.rules,v 1.4 2001-08-04 22:48:18 bellardo Exp $ # $Id: make.rules,v 1.5 2001-08-06 15:08:18 skywalker Exp $
# #
#____________________________________________________________________________ #____________________________________________________________________________
@ -79,7 +79,7 @@ export FIREBIRD
# I would like to remove this one. # I would like to remove this one.
SOURCE=$(ROOT)/src SOURCE=$(ROOT)/src
CFLAGS:= $(CFLAGS) -g -pipe -MMD -I$(ROOT)/src -I$(ROOT)/src/include CFLAGS:= $(CFLAGS) -g -pipe -MMD -p -fPIC -I$(ROOT)/src -I$(ROOT)/src/include
CXXFLAGS:= $(CXXFLAGS) $(CFLAGS) CXXFLAGS:= $(CXXFLAGS) $(CFLAGS)
@ -148,7 +148,7 @@ STATICLINK_LIBS = $(LINK_LIBS)
ifdef IsProdTypeBuild ifdef IsProdTypeBuild
CXXFLAGS:= -O3 -m486 -DPROD_BUILD $(CXXFLAGS) CXXFLAGS:= -O3 -m486 -DPROD_BUILD $(CXXFLAGS)
else else
CXXFLAGS:= -ggdb -DDEV_BUILD $(CXXFLAGS) CXXFLAGS:= -ggdb -DDEV_BUILD $(CXXFLAGS)
@ -193,12 +193,12 @@ GPRE_FLAGS= -r -m -z -n
.cpp.o: .cpp.o:
$(CXX) -c $(CXXFLAGS) $(CXX_INCLUDE_DIRS) $(VERSION_FLAG) $< $(CXX) -c $(CXXFLAGS) $(CXX_INCLUDE_DIRS) $(VERSION_FLAG) $<
.c.lo: #.c.lo:
$(CC) -c $(PIC_FLAGS) $(CFLAGS) $(CXX_INCLUDE_DIRS) $(VERSION_FLAG) -o $*.lo $< # $(CC) -c $(PIC_FLAGS) $(CFLAGS) $(CXX_INCLUDE_DIRS) $(VERSION_FLAG) -o $*.lo $<
#
.cpp.lo: #.cpp.lo:
$(CXX) -c $(PIC_FLAGS) $(CXXFLAGS) $(CXX_INCLUDE_DIRS) $(VERSION_FLAG) -o $*.lo $< # $(CXX) -c $(PIC_FLAGS) $(CXXFLAGS) $(CXX_INCLUDE_DIRS) $(VERSION_FLAG) -o $*.lo $<
#
$(OBJ)/%.o:: $(SRC)/%.c $(OBJ)/%.o:: $(SRC)/%.c

2
src/utilities/security.epp
View File

@ -36,7 +36,7 @@
/* DATABASE DB = STATIC FILENAME "isc.gdb"; */ /* DATABASE DB = STATIC FILENAME "isc.gdb"; */
DATABASE DB = FILENAME "isc.gdb"; DATABASE DB = FILENAME "isc4.gdb";
#define MAX_PASSWORD_LENGTH 31 #define MAX_PASSWORD_LENGTH 31
#define SYSDBA_USER_NAME "SYSDBA" #define SYSDBA_USER_NAME "SYSDBA"