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

Change makefiles to not touch source files to rebuild (it was making it

Browse Source 
hell to checkin to cvs since it then did a diff on all files)
Did a little bit with install.
This commit is contained in:
skywalker 2001-08-13 08:14:38 +00:00
parent baa3d722bf
commit 5df7da6266
25 changed files with 2033 additions and 4122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6029
configure vendored
View File

File diff suppressed because it is too large Load Diff

9
configure.in
View File

@ -52,9 +52,12 @@ esac
AC_SUBST(PLATFORM) AC_SUBST(PLATFORM)
SERVER_ARCHITECTURE_TYPE=classic FIREBIRD_ARCH_TYPE=classic
#SERVER_ARCHITECTURE_TYPE=super #FIREBIRD_ARCH_TYPE=super
AC_SUBST(SERVER_ARCHITECTURE_TYPE) AC_SUBST(FIREBIRD_ARCH_TYPE)
FIREBIRD_VERSION=2.0.0
AC_SUBST(FIREBIRD_VERSION)
PROD_BUILD_FLG= PROD_BUILD_FLG=
#PROD_BUILD_FLG=Y #PROD_BUILD_FLG=Y

13
src/install/Makefile.in
View File

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in,v 1.2 2001-08-02 07:03:59 skywalker Exp $ # $Id: Makefile.in,v 1.3 2001-08-13 08:14:38 skywalker Exp $
# #
ROOT=../.. ROOT=../..
@ -55,10 +55,11 @@ INSTALLDIR=@prefix@
BuildRoot=$(GEN_ROOT) BuildRoot=$(GEN_ROOT)
InstallRoot=$(SRC_ROOT)/src/install/linux InstallRoot=$(SRC_ROOT)/install/linux
RedhatPackageDir=/usr/src/redhat/RPMS/i386 #RedhatPackageDir=/usr/src/redhat/RPMS/i386
RedhatPackageDir=/usr/src/RPM/RPMS/i386
Version=1.5.0-1 Version=@FIREBIRD_VERSION@-1
ClassicTarFile=FirebirdCS-$(Version).tar.gz ClassicTarFile=FirebirdCS-$(Version).tar.gz
@ -74,7 +75,9 @@ LastClassicInstallFlg=.classicinstallflg
LastSuperInstallFlg=.superinstallflg LastSuperInstallFlg=.superinstallflg
install: runclassicinstall install: run@FIREBIRD_ARCH_TYPE@install
package : @FIREBIRD_ARCH_TYPE@packages
runclassicinstall: $(LastClassicInstallFlg) runclassicinstall: $(LastClassicInstallFlg)

4
src/jrd/isc_ipc.cpp
View File

@ -22,7 +22,7 @@
* Solaris x86 changes - Konstantin Kuznetsov, Neil McCalden * Solaris x86 changes - Konstantin Kuznetsov, Neil McCalden
*/ */
/* $Id: isc_ipc.cpp,v 1.4 2001-08-04 22:48:18 bellardo Exp $ */ /* $Id: isc_ipc.cpp,v 1.5 2001-08-13 08:14:38 skywalker Exp $ */
#ifdef SHLIB_DEFS #ifdef SHLIB_DEFS
#define LOCAL_SHLIB_DEFS #define LOCAL_SHLIB_DEFS
@ -798,7 +798,7 @@ static void isc_signal2(
memset(&vec.sa_mask, 0, sizeof(vec.sa_mask)); memset(&vec.sa_mask, 0, sizeof(vec.sa_mask));
vec.sa_flags = SA_RESTART; vec.sa_flags = SA_RESTART;
sigaction(signal_number, &vec, &old_vec); sigaction(signal_number, &vec, &old_vec);
ptr = old_vec.sa_handler; ptr = (SIG_FPTR) old_vec.sa_handler;
#endif #endif
#endif #endif
#pragma FB_COMPILER_MESSAGE("Fix! Ugly function pointer casts!") #pragma FB_COMPILER_MESSAGE("Fix! Ugly function pointer casts!")

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

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.alice,v 1.4 2001-08-07 02:15:26 bellardo Exp $ # $Id: Makefile.in.alice,v 1.5 2001-08-13 08:14:38 skywalker Exp $
# #
ROOT=../.. ROOT=../..
@ -68,5 +68,7 @@ yachts.lnk:
ln -fs ../refDatabases/empty.gdb yachts.lnk ln -fs ../refDatabases/empty.gdb yachts.lnk
FORCE:
-include $(Dependencies) -include $(Dependencies)

3
src/make.new/Makefile.in.burp
View File

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.burp,v 1.3 2001-08-07 02:15:26 bellardo Exp $ # $Id: Makefile.in.burp,v 1.4 2001-08-13 08:14:38 skywalker Exp $
# #
ROOT=../.. ROOT=../..
@ -99,5 +99,6 @@ $(SRC)/restore.cpp $(SRC)/backup.cpp : yachts.lnk
yachts.lnk: yachts.lnk:
ln -fs $(SRC_ROOT)/refDatabases/empty.gdb yachts.lnk ln -fs $(SRC_ROOT)/refDatabases/empty.gdb yachts.lnk
FORCE:
-include $(Dependencies) -include $(Dependencies)

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

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.dsql,v 1.3 2001-08-07 02:15:26 bellardo Exp $ # $Id: Makefile.in.dsql,v 1.4 2001-08-13 08:14:38 skywalker Exp $
# #
ROOT=../.. ROOT=../..
@ -78,4 +78,6 @@ parse.cpp: parse.sed y.tab.c
sed -f $< y.tab.c > $@ sed -f $< y.tab.c > $@
# -$(RM) y.tab.c # -$(RM) y.tab.c
FORCE:
-include $(Dependencies) -include $(Dependencies)

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

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.dudley,v 1.4 2001-08-07 02:15:26 bellardo Exp $ # $Id: Makefile.in.dudley,v 1.5 2001-08-13 08:14:38 skywalker Exp $
# #
ROOT=../.. ROOT=../..
@ -68,4 +68,6 @@ yachts.lnk:
ln -fs $(SRC_ROOT)/refDatabases/empty.gdb yachts.lnk ln -fs $(SRC_ROOT)/refDatabases/empty.gdb yachts.lnk
FORCE:
-include $(Dependencies) -include $(Dependencies)

6
src/make.new/Makefile.in.extlib
View File

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.extlib,v 1.1 2001-07-29 23:43:23 skywalker Exp $ # $Id: Makefile.in.extlib,v 1.2 2001-08-13 08:14:38 skywalker Exp $
# #
ROOT=../.. ROOT=../..
@ -73,3 +73,7 @@ $(LIB)/ib_util.so(%.o) : %.o
.cpp.o: .cpp.o:
$(CXX) -c $(PIC_FLAGS) $(CXX_INCLUDE_DIRS) $(VERSION_FLAG) $< $(CXX) -c $(PIC_FLAGS) $(CXX_INCLUDE_DIRS) $(VERSION_FLAG) $<
FORCE:

3
src/make.new/Makefile.in.fbutil
View File

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.fbutil,v 1.3 2001-08-07 02:15:26 bellardo Exp $ # $Id: Makefile.in.fbutil,v 1.4 2001-08-13 08:14:38 skywalker Exp $
# #
ROOT=../.. ROOT=../..
@ -54,6 +54,7 @@ clean:
-rm $(AllObjects) -rm $(AllObjects)
-rm $(Dependancies) -rm $(Dependancies)
FORCE:
-include $(Dependancies) -include $(Dependancies)

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

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.firebird,v 1.4 2001-08-07 02:15:26 bellardo Exp $ # $Id: Makefile.in.firebird,v 1.5 2001-08-13 08:14:38 skywalker Exp $
# #
ROOT=.. ROOT=..
@ -1196,4 +1196,6 @@ superrpmfile: force
make -f firebird/skywalker/install/Makefile superrpmfile make -f firebird/skywalker/install/Makefile superrpmfile
FORCE:
force: force:

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

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.gpre,v 1.5 2001-08-07 02:15:26 bellardo Exp $ # $Id: Makefile.in.gpre,v 1.6 2001-08-13 08:14:38 skywalker Exp $
# #
ROOT=../.. ROOT=../..
@ -110,4 +110,6 @@ $(SRC)/gpre_meta.cpp: $(SRC)/gpre_meta.epp
jrdlib_dependencies: $(GPRELIB_Objects) jrdlib_dependencies: $(GPRELIB_Objects)
FORCE:
-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.3 2001-08-06 15:08:18 skywalker Exp $ # $Id: Makefile.in.intl,v 1.4 2001-08-13 08:14:38 skywalker Exp $
# #
ROOT=../.. ROOT=../..
@ -78,4 +78,6 @@ $(LIBGDSINTL_LA) : $(INTL_Objects1)
# MOD 26-July-2001 # MOD 26-July-2001
FORCE:
-include $(Dependencies) -include $(Dependencies)

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

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.isql,v 1.3 2001-08-07 02:15:26 bellardo Exp $ # $Id: Makefile.in.isql,v 1.4 2001-08-13 08:14:38 skywalker Exp $
# #
ROOT=../.. ROOT=../..
@ -112,5 +112,7 @@ muisql: isql muisql.o
-$(CHMOD_6) muisql -$(CHMOD_6) muisql
FORCE:
-include $(Dependencies) -include $(Dependencies)

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

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.jrd,v 1.6 2001-08-07 02:15:26 bellardo Exp $ # $Id: Makefile.in.jrd,v 1.7 2001-08-13 08:14:38 skywalker Exp $
# #
ROOT=../.. ROOT=../..
@ -787,4 +787,6 @@ AllObjects = $(BOOT_Objects) $(JRD_Objects)
Dependencies = $(AllObjects:.o=.d) Dependencies = $(AllObjects:.o=.d)
FORCE:
-include $(Dependencies) -include $(Dependencies)

8
src/make.new/Makefile.in.lock
View File

@ -1,4 +1,4 @@
#
# The contents of this file are subject to the Mozilla Public # The contents of this file are subject to the Mozilla Public
# License Version 1.1 (the "License"); you may not use this file # License Version 1.1 (the "License"); you may not use this file
# except in compliance with the License. You may obtain a copy of # except in compliance with the License. You may obtain a copy of
@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.lock,v 1.4 2001-08-07 02:15:26 bellardo Exp $ # $Id: Makefile.in.lock,v 1.5 2001-08-13 08:14:38 skywalker Exp $
# #
ROOT=../.. ROOT=../..
@ -80,7 +80,7 @@ jrdlib_dependencies: $(LOCK_Objects)
gds_lock_manager : $(BIN)/gds_lock_mgr gds_lock_manager : $(BIN)/gds_lock_mgr
$(BIN)/gds_lock_mgr: $(LOCKMGR_Objects) $(BOOT_GDSLIB_Objects) $(BIN)/gds_lock_mgr: $(LOCKMGR_Objects) $(BOOT_GDSLIB_Objects)
$(CXX) $(LINK_OPTS) $^ -o $@ $(CXX) $(LINK_OPTS) $^ -o $@ $(LINK_LIBS)
$(CHMOD_S7) $@ $(CHMOD_S7) $@
@ -124,4 +124,6 @@ $(BIN)/lock_driver: $(LOCKDRIVER_OBJECTS) $(LIBGDS_DEP)
$(CHMOD_S7) $@ $(CHMOD_S7) $@
FORCE:
-include $(Dependencies) -include $(Dependencies)

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

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.msgs,v 1.4 2001-08-07 02:15:26 bellardo Exp $ # $Id: Makefile.in.msgs,v 1.5 2001-08-13 08:14:38 skywalker Exp $
# #
ROOT=../.. ROOT=../..
@ -156,4 +156,6 @@ $(ja_JA_MSG) : $(BUILD_FILE) indicator.msg
$(CHMOD_6) $@ $(CHMOD_6) $@
FORCE:
-include $(Dependencies) -include $(Dependencies)

3
src/make.new/Makefile.in.pipe
View File

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.pipe,v 1.3 2001-08-07 02:15:26 bellardo Exp $ # $Id: Makefile.in.pipe,v 1.4 2001-08-13 08:14:38 skywalker Exp $
# #
ROOT=../.. ROOT=../..
@ -58,5 +58,6 @@ jrdlib_dependencies: $(PIPE_Objects)
# PIPE # PIPE
FORCE:
-include $(Dependencies) -include $(Dependencies)

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

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.qli,v 1.3 2001-08-07 02:15:26 bellardo Exp $ # $Id: Makefile.in.qli,v 1.4 2001-08-13 08:14:38 skywalker Exp $
# #
ROOT=../.. ROOT=../..
@ -86,6 +86,8 @@ yachts.lnk:
help.gdb: help.gdb:
ln -fs $(SRC_ROOT)/refDatabases/help.gdb help.gdb ln -fs $(SRC_ROOT)/refDatabases/help.gdb help.gdb
FORCE:
-include $(Dependencies) -include $(Dependencies)

5
src/make.new/Makefile.in.refDatabases
View File

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.refDatabases,v 1.1 2001-07-29 23:43:23 skywalker Exp $ # $Id: Makefile.in.refDatabases,v 1.2 2001-08-13 08:14:38 skywalker Exp $
# #
ROOT=../.. ROOT=../..
@ -104,3 +104,6 @@ metadata.gdb.x: $(SRC_ROOT)/misc/metadata.sql
$(BIN)/isql -i $< $(BIN)/isql -i $<
chmod 444 metadata.gdb chmod 444 metadata.gdb
touch $@ touch $@
FORCE:

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

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.remote,v 1.4 2001-08-07 02:15:26 bellardo Exp $ # $Id: Makefile.in.remote,v 1.5 2001-08-13 08:14:38 skywalker Exp $
# #
ROOT=../.. ROOT=../..
@ -296,4 +296,6 @@ force:
merge.j: merge.o merge.j: merge.o
FORCE:
-include $(Dependencies) -include $(Dependencies)

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

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.utilities,v 1.6 2001-08-07 02:15:26 bellardo Exp $ # $Id: Makefile.in.utilities,v 1.7 2001-08-13 08:14:38 skywalker Exp $
# #
ROOT=../.. ROOT=../..
@ -152,7 +152,7 @@ $(ISC_GDB) : isc4.sql isc4.gdl
# touch the dependancy file. # touch the dependancy file.
build_alt_use_boot: build_alt_use_boot:
-$(RM) security.cpp -$(RM) security.cpp $(DEP)/security.d
touch security.cpp touch security.cpp
touch $(DEP)/security.d touch $(DEP)/security.d
@ -273,4 +273,6 @@ install_svc.exe: install_svc.o services.o
$(RM) install_svc.exe $(RM) install_svc.exe
$(TOUCH) install_svc.exe $(TOUCH) install_svc.exe
FORCE:
-include $(Dependencies) -include $(Dependencies)

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

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.wal,v 1.3 2001-08-07 02:15:26 bellardo Exp $ # $Id: Makefile.in.wal,v 1.4 2001-08-13 08:14:38 skywalker Exp $
# #
ROOT=../.. ROOT=../..
@ -124,5 +124,7 @@ driver.exe: driver.o $(WAL_OBJECTS) $(JRD_OBJECTS) $(OBJS)/jrd/thd.o
$(RM) wal.rsp $(RM) wal.rsp
FORCE:
-include $(Dependencies) -include $(Dependencies)

6
src/make.new/make.defaults
View File

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: make.defaults,v 1.6 2001-08-07 02:15:26 bellardo Exp $ # $Id: make.defaults,v 1.7 2001-08-13 08:14:38 skywalker Exp $
# #
@ -43,8 +43,10 @@
#_____________________________________________________________________________ #_____________________________________________________________________________
SERVER_ARCH_TYPE = @SERVER_ARCHITECTURE_TYPE@ FIREBIRD_ARCH_TYPE = @FIREBIRD_ARCH_TYPE@
INSTALL_PREFIX = @prefix@ INSTALL_PREFIX = @prefix@
FIREBIRD_VERSION = @FIREBIRD_VERSION@
# Default programs and tools to be used in the build process # Default programs and tools to be used in the build process

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

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: make.rules,v 1.5 2001-08-06 15:08:18 skywalker Exp $ # $Id: make.rules,v 1.6 2001-08-13 08:14:38 skywalker Exp $
# #
#____________________________________________________________________________ #____________________________________________________________________________
@ -226,16 +226,18 @@ $(OBJ)/%.o: $(DEP)/%.d
$(DEP)/%.d:: $(SRC)/%.c $(DEP)/%.d:: $(SRC)/%.c
@echo "need to rebuild $^" @echo "need to rebuild $^"
touch $^ echo $(OBJ)/$(*).o " : FORCE" > $@
# touch $^
$(DEP)/%.d:: $(SRC)/%.epp $(DEP)/%.d:: $(SRC)/%.epp
@echo "need to rebuild $^" @echo "need to rebuild $^"
touch $^ echo $(OBJ)/$(*).o " : FORCE" > $@
# touch $^
$(DEP)/%.d:: $(SRC)/%.cpp $(DEP)/%.d:: $(SRC)/%.cpp
@echo "need to rebuild $^" @echo "need to rebuild $^"
touch $^ echo $(OBJ)/$(*).o " : FORCE" > $@
# touch $^
# code to move the dependancy files from the current directory # code to move the dependancy files from the current directory