From 13d14ab8a550895f05bbd6e58ebdb790eda64181 Mon Sep 17 00:00:00 2001
From: skywalker <skywalker@users.sourceforge.net>
Date: Mon, 6 Aug 2001 15:08:18 +0000
Subject: [PATCH] Changed makefiles to only use .o files drop the .lo files
 Change security.epp to use isc4.gdb rather than original isc.gdb

---
 src/make.new/Makefile.in.dudley    |  4 ++--
 src/make.new/Makefile.in.intl      |  4 ++--
 src/make.new/Makefile.in.jrd       |  4 ++--
 src/make.new/Makefile.in.utilities |  7 +++++--
 src/make.new/make.rules            | 18 +++++++++---------
 src/utilities/security.epp         |  2 +-
 6 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/make.new/Makefile.in.dudley b/src/make.new/Makefile.in.dudley
index 7c1ee54717..e2fc330775 100644
--- a/src/make.new/Makefile.in.dudley
+++ b/src/make.new/Makefile.in.dudley
@@ -26,7 +26,7 @@
 #   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=../..
@@ -65,7 +65,7 @@ $(BIN)/gdef: $(DUDLEY_Objects) $(LIBGDS_LA)
 $(SRC)/exe.cpp $(SRC)/extract.epp:	yachts.lnk
 
 yachts.lnk:
-	ln -fs (SRC_ROOT)/refDatabases/empty.gdb yachts.lnk
+	ln -fs $(SRC_ROOT)/refDatabases/empty.gdb yachts.lnk
 
 
 -include $(Dependencies)
diff --git a/src/make.new/Makefile.in.intl b/src/make.new/Makefile.in.intl
index eafbd76792..e8386ad759 100644
--- a/src/make.new/Makefile.in.intl
+++ b/src/make.new/Makefile.in.intl
@@ -26,7 +26,7 @@
 #   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=../..
@@ -68,7 +68,7 @@ INTL_DIR = $(FIREBIRD)/intl
 intl: $(LIBGDSINTL_LA)
 
 $(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
diff --git a/src/make.new/Makefile.in.jrd b/src/make.new/Makefile.in.jrd
index c24f32608b..59b899c772 100644
--- a/src/make.new/Makefile.in.jrd
+++ b/src/make.new/Makefile.in.jrd
@@ -26,7 +26,7 @@
 #   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=../..
@@ -99,7 +99,7 @@ jrdlib_main : $(LIBGDS_LA)
 
 
 $(LIBGDS_SO) : $(GDSLIB_Objects)
-	$(LIB_LINK) $(LIB_LINK_OPTIONS)  -o $@ $(GDSLIB_SharedObjects)
+	$(LIB_LINK) $(LIB_LINK_OPTIONS)  -o $@ $^
 
 $(LIBGDS_A) : $(GDSLIB_Objects)
 	$(STATICLIB_LINK) $(LIB_LINK_OPTIONS)  $@ $^
diff --git a/src/make.new/Makefile.in.utilities b/src/make.new/Makefile.in.utilities
index 09073922bd..60af8c6f24 100644
--- a/src/make.new/Makefile.in.utilities
+++ b/src/make.new/Makefile.in.utilities
@@ -26,7 +26,7 @@
 #   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=../..
@@ -233,7 +233,9 @@ $(GDS_RELAY):	$(RELAY_Objects)	 $(LIBGDS_LA)
 	$(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
 
@@ -241,6 +243,7 @@ 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
 # 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
diff --git a/src/make.new/make.rules b/src/make.new/make.rules
index 9744424511..b40aa08336 100644
--- a/src/make.new/make.rules
+++ b/src/make.new/make.rules
@@ -26,7 +26,7 @@
 #   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.
 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) 
 
@@ -148,7 +148,7 @@ STATICLINK_LIBS = $(LINK_LIBS)
 
 
 ifdef IsProdTypeBuild
-    CXXFLAGS:=            -O3 -m486 -DPROD_BUILD $(CXXFLAGS)
+    CXXFLAGS:=            -O3 -m486 -DPROD_BUILD  $(CXXFLAGS)
 
 else
     CXXFLAGS:=		-ggdb -DDEV_BUILD $(CXXFLAGS)
@@ -193,12 +193,12 @@ GPRE_FLAGS=	-r -m -z -n
 .cpp.o:
 	$(CXX) -c $(CXXFLAGS) $(CXX_INCLUDE_DIRS) $(VERSION_FLAG) $<
 
-.c.lo:
-	$(CC) -c $(PIC_FLAGS) $(CFLAGS) $(CXX_INCLUDE_DIRS) $(VERSION_FLAG) -o $*.lo $<
-
-.cpp.lo:
-	$(CXX) -c $(PIC_FLAGS) $(CXXFLAGS) $(CXX_INCLUDE_DIRS) $(VERSION_FLAG) -o $*.lo $<
-
+#.c.lo:
+#	$(CC) -c $(PIC_FLAGS) $(CFLAGS) $(CXX_INCLUDE_DIRS) $(VERSION_FLAG) -o $*.lo $<
+#
+#.cpp.lo:
+#	$(CXX) -c $(PIC_FLAGS) $(CXXFLAGS) $(CXX_INCLUDE_DIRS) $(VERSION_FLAG) -o $*.lo $<
+#
 
 
 $(OBJ)/%.o:: $(SRC)/%.c 
diff --git a/src/utilities/security.epp b/src/utilities/security.epp
index ec8395d8e9..0c132bae7b 100644
--- a/src/utilities/security.epp
+++ b/src/utilities/security.epp
@@ -36,7 +36,7 @@
 
 /* DATABASE DB = STATIC FILENAME "isc.gdb"; */
 
-DATABASE DB = FILENAME "isc.gdb";
+DATABASE DB = FILENAME "isc4.gdb";
 
 #define MAX_PASSWORD_LENGTH	31
 #define SYSDBA_USER_NAME	"SYSDBA"