8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 22:43:03 +01:00

Use predefined macros from make.defaults!

This commit is contained in:
eku 2003-04-10 06:34:24 +00:00
parent 26e70d00a6
commit 02c8b57d75
7 changed files with 59 additions and 59 deletions

View File

@ -27,7 +27,7 @@
# Contributor(s):
#
#
# $Id: Makefile.in.embed.qli,v 1.8 2003-03-28 11:29:18 aafemt Exp $
# $Id: Makefile.in.embed.qli,v 1.9 2003-04-10 06:34:22 eku Exp $
#
ROOT=..
ObjModuleName=embed.qli
@ -66,8 +66,8 @@ $(QLI): $(QLI_Objects)
# EKU: At this point yachts.lnk is a link to empty.fdb, but gpre will fail
# with it. metadata.fdb is what is needed here.
create_yachts:
-rm -f yachts.lnk
-ln -fs $(SRC_ROOT)/metadata.fdb yachts.lnk
-$(RM) yachts.lnk
-$(LN_S) -f $(SRC_ROOT)/metadata.fdb yachts.lnk
# qli_help

View File

@ -26,7 +26,7 @@
# Contributor(s):
#
#
# $Id: Makefile.in.example5,v 1.5 2003-03-27 11:21:44 aafemt Exp $
# $Id: Makefile.in.example5,v 1.6 2003-04-10 06:34:23 eku Exp $
#
ROOT=../..
@ -99,7 +99,7 @@ v5_examples: employee.fdb $(NT_EXAMPLES) makefile.example
$(CP) $(EXAMPLES_SRC)dyn4.e $(EXAMPLES_DEST)dyn4.e
$(CP) $(EXAMPLES_SRC)dyn5.e $(EXAMPLES_DEST)dyn5.e
$(CP) $(EXAMPLES_SRC)dynfull.e $(EXAMPLES_DEST)dynfull.e
echo $(LD_LIBRARY_PATH)
$(ECHO) $(LD_LIBRARY_PATH)
$(GBAK) employee.fdb $(EXAMPLES_DEST)employee.gbk
# -$(RM) $(EXAMPLES_DEST)employee.fdb
$(GBAK) -r $(EXAMPLES_DEST)employee.gbk $(EXAMPLES_DEST)employee.fdb

View File

@ -27,7 +27,7 @@
# Contributor(s):
#
#
# $Id: Makefile.in.firebird,v 1.35 2003-04-08 10:20:37 aafemt Exp $
# $Id: Makefile.in.firebird,v 1.36 2003-04-10 06:34:24 eku Exp $
#
ROOT=..
@ -519,15 +519,15 @@ script_files : $(INSTALL_ScriptFiles)
$(BIN)/% :: $(SRC_ROOT)/install/classic/%
$(CP) $^ $@
chmod ugo=rx $@
$(CHMOD) ugo=rx $@
$(BIN)/% :: $(SRC_ROOT)/install/super/%
$(CP) $^ $@
chmod ugo=rx $@
$(CHMOD) ugo=rx $@
$(BIN)/% :: $(SRC_ROOT)/install/misc/%
$(CP) $^ $@
chmod ugo=rx $@
$(CHMOD) ugo=rx $@
#___________________________________________________________________________
@ -545,18 +545,18 @@ install package packages dist:
clean: clean_objects clean_dependancies clean_extern_objects clean_build clean_gpre_gen
clean_config: clean clean_makefiles
rm -f $(ROOT)/configure
$(RM) $(ROOT)/configure
# Not sure if this one is still needed MOD 7-Oct-2002
clean_dbs:
-rm -f refDatabases/*\.fdb
-$(RM) refDatabases/*\.fdb
clean_objects:
rm -f `find $(GEN_ROOT)/ -type f -name '*.o' -print`
$(RM) `find $(GEN_ROOT)/ -type f -name '*.o' -print`
clean_extern_objects:
rm -f `find $(SRC_ROOT)/extern/ -type f -name '*.o' -print`
$(RM) `find $(SRC_ROOT)/extern/ -type f -name '*.o' -print`
# Clear out dependancies files created by the gcc compiler
# since when .o and other files are deleted the dependant
@ -564,22 +564,22 @@ clean_extern_objects:
# MOD 10-July-2002
clean_dependancies:
rm -f `find $(GEN_ROOT)/ -type f -name '*.d' -print`
$(RM) -f `find $(GEN_ROOT)/ -type f -name '*.d' -print`
# delete only all of the files of type regular file in $FIREBIRD
# leave the directories to make dependacies work still
# MOD 11-July-2002
clean_build:
rm -f `find $(GEN_ROOT)/firebird -type f -print`
# rm -f $(GDSLIB_OBJECTS) $(GDSLIB_PHASE3_OBJECTS)
$(RM) `find $(GEN_ROOT)/firebird -type f -print`
# $(RM) $(GDSLIB_OBJECTS) $(GDSLIB_PHASE3_OBJECTS)
#
clean_makefiles:
rm -f $(GEN_ROOT)/Makefile.*
$(RM) $(GEN_ROOT)/Makefile.*
clean_gpre_gen:
-rm -f `find $(SRC_ROOT) -type f -name '*.epp' -print | sed 's/epp$$/cpp/'`
-$(RM) `find $(SRC_ROOT) -type f -name '*.epp' -print | sed 's/epp$$/cpp/'`
#___________________________________________________________________________

View File

@ -27,7 +27,7 @@
# Contributor(s):
#
#
# $Id: Makefile.in.msgs,v 1.8 2003-03-27 11:21:45 aafemt Exp $
# $Id: Makefile.in.msgs,v 1.9 2003-04-10 06:34:24 eku Exp $
#
ROOT=..
ObjModuleName=msgs
@ -147,7 +147,7 @@ indicator.loc:
master_msg_db:
ln -fs $(SRC_ROOT)/msg.fdb master_msg_db
$(LN_S) -f $(SRC_ROOT)/msg.fdb master_msg_db

View File

@ -27,7 +27,7 @@
# Contributor(s):
#
#
# $Id: Makefile.in.refDatabases,v 1.14 2003-03-27 11:21:45 aafemt Exp $
# $Id: Makefile.in.refDatabases,v 1.15 2003-04-10 06:34:24 eku Exp $
#
ROOT=..
ObjModuleName=refDatabases
@ -67,15 +67,15 @@ empty_db : empty.fdb yachts.lnk
empty.fdb : $(BIN)/create_db
-$(RM) $@
$(BIN)/create_db $@
touch $@
chmod 444 $@
$(TOUCH) $@
$(CHMOD) 444 $@
# Ok so Jim had/has a sailing theme, and the sample database that a lot
# of .epp files require to compile is yachts.lnk. MOD 05-Aug-2002
yachts.lnk: empty.fdb
$(RM) -f yachts.lnk
ln -fs $(SRC_ROOT)/empty.fdb yachts.lnk
$(LN_S) -f $(SRC_ROOT)/empty.fdb yachts.lnk
@ -88,39 +88,39 @@ ref_databases : msg.fdb help.fdb metadata.fdb security.fdb
msg.fdb: $(SRC_ROOT)/msgs/msg.gbak
$(BIN)/gbak_static -MODE read_only -R $< $@
touch $@
chmod 444 $@
$(TOUCH) $@
$(CHMOD) 444 $@
help.fdb: $(FIREBIRD)/help/help.fdb
$(RM) -f $@
ln -fs $^ $@
$(LN_S) -f $^ $@
$(FIREBIRD)/help/help.fdb: $(SRC_ROOT)/misc/help.gbak
$(BIN)/gbak_static -MODE read_only -R $< $@
touch $@
chmod 444 $@
$(TOUCH) $@
$(CHMOD) 444 $@
security.fdb: $(FIREBIRD)/security.fdb
$(RM) -f $@
ln -fs $^ $@
$(LN_S) -f $^ $@
$(FIREBIRD)/security.fdb: $(SRC_ROOT)/misc/security.gbak
$(BIN)/gbak_static -R $< $@
touch $@
chmod 666 $@
$(TOUCH) $@
$(CHMOD) 666 $@
metadata.fdb: $(SRC_ROOT)/misc/metadata.gbak
$(BIN)/gbak_static -MODE read_only -R $< $@
touch $@
chmod 444 $@
$(TOUCH) $@
$(CHMOD) 444 $@
# An alternative metadata creation method, this one is actually preferred
# since it ensures the data is valid.
metadata.fdb.x: $(SRC_ROOT)/misc/metadata.sql
$(BIN)/isql -i $<
touch $@
chmod 444 $@
$(TOUCH) $@
$(CHMOD) 444 $@
FORCE:

View File

@ -26,7 +26,7 @@
# Contributor(s):
#
#
# $Id: make.rules,v 1.16 2003-04-08 10:20:37 aafemt Exp $
# $Id: make.rules,v 1.17 2003-04-10 06:34:24 eku Exp $
#
#____________________________________________________________________________
@ -158,7 +158,7 @@ STATICLINK_LIBS = @LIBS@ @EDITLINE_A@
#
# testgpre = $(shell if [ -f $(GPRE) ]; then; echo $(GPRE); else; echo ""; fi)
#test1:
# echo $(testgpre)
# $(ECHO) $(testgpre)
GPRE_FLAGS= -r -m -z -n
@ -228,19 +228,19 @@ $(OBJ)/%.o: $(DEP)/%.d
# .cpp files
$(DEP)/%.d:: $(SRC)/%.c
@echo "need to rebuild $^"
echo $(OBJ)/$(*).o " : FORCE" > $@
# touch $^
@$(ECHO) "need to rebuild $^"
$(ECHO) $(OBJ)/$(*).o " : FORCE" > $@
# $(TOUCH) $^
$(DEP)/%.d:: $(SRC)/%.epp
@echo "need to rebuild $^"
echo $(OBJ)/$(*).o " : FORCE" > $@
# touch $^
@$(ECHO) "need to rebuild $^"
$(ECHO) $(OBJ)/$(*).o " : FORCE" > $@
# $(TOUCH) $^
$(DEP)/%.d:: $(SRC)/%.cpp
@echo "need to rebuild $^"
echo $(OBJ)/$(*).o " : FORCE" > $@
# touch $^
@$(ECHO) "need to rebuild $^"
$(ECHO) $(OBJ)/$(*).o " : FORCE" > $@
# $(TOUCH) $^
# Rules for making resource files
@ -256,9 +256,9 @@ define move-dep
if [ -f $(*F).d ]; \
then \
sed -e '1 s#$(@F)#$(OBJ)\/$(@F)#' $(*F).d > tmp.d; \
mv tmp.d $(OBJ)/$(*F).d; \
rm $(*F).d; \
touch $@; \
$(MV) tmp.d $(OBJ)/$(*F).d; \
$(RM) $(*F).d; \
$(TOUCH) $@; \
fi
endef

View File

@ -27,7 +27,7 @@
# Contributor(s):
#
#
# $Id: make.shared.targets,v 1.9 2003-04-03 07:35:20 eku Exp $
# $Id: make.shared.targets,v 1.10 2003-04-10 06:34:24 eku Exp $
#
@ -60,11 +60,11 @@ $(SRC)/jrd/dyn_def.cpp : $(SRC)/jrd/dyn_def.epp $(SRC)/jrd/dyn_def.sed
$(SRC)/dsql/parse.cpp: $(SRC)/dsql/parse.y $(SRC)/dsql/parse.sed
$(YACC) -l -d $<
mv -f $(SRC)/y.tab.c $(SRC)/dsql/dsql.tab.c
mv -f $(SRC)/y.tab.h $(SRC)/dsql/dsql.tab.h
$(MV) $(SRC)/y.tab.c $(SRC)/dsql/dsql.tab.c
$(MV) $(SRC)/y.tab.h $(SRC)/dsql/dsql.tab.h
sed -e 's/\\r//g' $(SRC)/dsql/parse.sed > $(SRC)/dsql/parse2.sed
sed -f $(SRC)/dsql/parse2.sed <$(SRC)/dsql/dsql.tab.c > $@
-rm $(SRC)/dsql/parse2.sed
-$(RM) $(SRC)/dsql/parse2.sed
@ -80,13 +80,13 @@ $(SRC)/gpre/gpre_meta.cpp: $(SRC)/gpre/gpre_meta.epp
buildb: security.fdb yachts.lnk help.fdb
security.fdb : $(ISC_GDB)
-ln -sf $(ISC_GDB) $@
-$(LN_S) -f $(ISC_GDB) $@
yachts.lnk:
-ln -fs $(SRC_ROOT)/refDatabases/empty.fdb yachts.lnk
-$(LN_S) -f $(SRC_ROOT)/refDatabases/empty.fdb yachts.lnk
help.fdb:
-ln -fs $(SRC_ROOT)/refDatabases/help.fdb help.fdb
-$(LN_S) -f $(SRC_ROOT)/refDatabases/help.fdb help.fdb
@ -119,8 +119,8 @@ $(GEN_ROOT)/remote/window.res: $(SRC_ROOT)/remote/window.rc $(SRC_ROOT)/remote/w
.PHONY: clean FORCE
clean:
-rm $(AllObjects)
-rm $(Dependancies)
-$(RM) $(AllObjects)
-$(RM) $(Dependancies)
# This target is used in the generated dependancy xxx.d files which are