Makefile.in (Firebird-3.0.2.32703-0.tar.bz2) | : | Makefile.in (Firebird-3.0.4.33054-0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 128 | skipping to change at line 128 | |||
#___________________________________________________________________________ | #___________________________________________________________________________ | |||
# build external software | # build external software | |||
# | # | |||
extern: | extern: | |||
$(MAKE) -C $(ROOT)/extern/btyacc | $(MAKE) -C $(ROOT)/extern/btyacc | |||
$(MAKE) -C $(ROOT)/extern/cloop TARGET=release WITH_FPC=0 BUILD_DIR=$(TMP _ROOT)/cloop OUT_DIR=$(GEN_ROOT)/$(TARGET)/cloop | $(MAKE) -C $(ROOT)/extern/cloop TARGET=release WITH_FPC=0 BUILD_DIR=$(TMP _ROOT)/cloop OUT_DIR=$(GEN_ROOT)/$(TARGET)/cloop | |||
ifeq ($(TOMBUILD_FLG),Y) | ifeq ($(TOMBUILD_FLG),Y) | |||
$(MAKE) -C $(ROOT)/extern/libtommath -f makefile.shared | echo $(LIBTOOL) | |||
$(MAKE) -C $(ROOT)/extern/libtommath -f makefile.shared LIBTOOL=$(LIBTOOL | ||||
) | ||||
ln -sf $(TOMMATH_SO).$(TOMMATH_VER) $(LIB) | ln -sf $(TOMMATH_SO).$(TOMMATH_VER) $(LIB) | |||
ln -sf $(TOMMATH_SO) $(LIB) | ln -sf $(TOMMATH_SO) $(LIB) | |||
endif | endif | |||
ifeq ($(STD_EDITLINE),false) | ifeq ($(STD_EDITLINE),false) | |||
ifeq ($(EDITLINE_FLG),Y) | ifeq ($(EDITLINE_FLG),Y) | |||
$(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline | $(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline | |||
endif | endif | |||
endif | endif | |||
skipping to change at line 163 | skipping to change at line 164 | |||
TOMLIB=$(LIB)/libtommath.a | TOMLIB=$(LIB)/libtommath.a | |||
TOM_Objs=$(addprefix ../extern/libtommath/,$(call doObjects,$(call dirFiles,../e xtern/libtommath))) | TOM_Objs=$(addprefix ../extern/libtommath/,$(call doObjects,$(call dirFiles,../e xtern/libtommath))) | |||
tommath: $(TOMLIB) | tommath: $(TOMLIB) | |||
$(TOMLIB): $(TOM_Objs) | $(TOMLIB): $(TOM_Objs) | |||
-$(RM) $@ | -$(RM) $@ | |||
$(STATICLIB_LINK) $@ $^ | $(STATICLIB_LINK) $@ $^ | |||
#___________________________________________________________________________ | #___________________________________________________________________________ | |||
# main build target for both debug abd release builds | # main build target for both debug and release builds | |||
# | # | |||
.PHONY: cross1 cross2 boot yvalve engine fbintl gpre utilities plugins re st codes ids examples cross_rest | .PHONY: cross1 cross2 boot yvalve engine fbintl gpre utilities plugins re st codes ids examples cross_rest preliminaryCheck | |||
master_process: | master_process: | |||
ln -sf $(SRC_ROOT)/include/gen/autoconfig.auto $(SRC_ROOT)/include/gen/au toconfig.h | ln -sf $(SRC_ROOT)/include/gen/autoconfig.auto $(SRC_ROOT)/include/gen/au toconfig.h | |||
$(MAKE) updateBuildNum | $(MAKE) updateBuildNum | |||
$(MAKE) export_lists | $(MAKE) export_lists | |||
$(MAKE) extern | $(MAKE) extern | |||
$(MAKE) updateCloopInterfaces | $(MAKE) updateCloopInterfaces | |||
$(MAKE) preliminaryCheck | ||||
$(MAKE) boot | $(MAKE) boot | |||
$(MAKE) yvalve | $(MAKE) yvalve | |||
ifeq ($(IsDeveloper), Y) | ifeq ($(IsDeveloper), Y) | |||
# In developer mode we must regenerate various files in include/gen | # In developer mode we must regenerate various files in include/gen | |||
$(MAKE) ids | $(MAKE) ids | |||
endif | endif | |||
$(MAKE) engine | $(MAKE) engine | |||
$(MAKE) fbintl | $(MAKE) fbintl | |||
$(MAKE) utilities | $(MAKE) utilities | |||
# Now having ready such useful tools as gbak and isql, we may restore / create | # Now having ready such useful tools as gbak and isql, we may restore / create | |||
skipping to change at line 237 | skipping to change at line 239 | |||
cross2: | cross2: | |||
ln -sf $(SRC_ROOT)/include/cross/$(CROSS_CONFIG) $(SRC_ROOT)/include/gen/ autoconfig.h | ln -sf $(SRC_ROOT)/include/cross/$(CROSS_CONFIG) $(SRC_ROOT)/include/gen/ autoconfig.h | |||
$(MAKE) prerequisites | $(MAKE) prerequisites | |||
$(MAKE) tommath | $(MAKE) tommath | |||
$(MAKE) yvalve | $(MAKE) yvalve | |||
$(MAKE) engine | $(MAKE) engine | |||
$(MAKE) fbintl | $(MAKE) fbintl | |||
$(MAKE) utilities | $(MAKE) utilities | |||
$(MAKE) $(GPRE) | $(MAKE) $(GPRE) | |||
$(MAKE) plugins | $(MAKE) plugins | |||
$(MAKE) -f Makefile.plugins_examples -C $(GEN_ROOT)/examples/ | $(MAKE) -f Makefile.plugins_examples | |||
$(MAKE) cross_rest | $(MAKE) cross_rest | |||
#___________________________________________________________________________ | #___________________________________________________________________________ | |||
# preliminary checks - make sure platform is OK to build FB | ||||
# | ||||
STD_SIZES:=$(SRC_ROOT)/misc/ods.txt | ||||
RUN_SIZES:=$(GEN_ROOT)/ods.txt | ||||
ODS_H:=$(SRC_ROOT)/jrd/ods.h | ||||
ODS_AWK:=$(SRC_ROOT)/misc/ods.awk | ||||
ODS_TEST_CPP:=$(GEN_ROOT)/odstest.cpp | ||||
ODS_TEST:=$(GEN_ROOT)/odstest$(EXEC_EXT) | ||||
preliminaryCheck: $(STD_SIZES) $(RUN_SIZES) | ||||
diff -u $^ | ||||
$(RUN_SIZES): $(ODS_H) $(ODS_AWK) | ||||
awk -f $(ODS_AWK) <$(ODS_H) >$(ODS_TEST_CPP) | ||||
$(CXX) -o $(ODS_TEST) $(WCXXFLAGS) $(ODS_TEST_CPP) | ||||
$(ODS_TEST) >$(RUN_SIZES) | ||||
#___________________________________________________________________________ | ||||
# static library - various common code, used in different FB projects | # static library - various common code, used in different FB projects | |||
# | # | |||
$(COMMON_LIB): $(Common_Objects) | $(COMMON_LIB): $(Common_Objects) | |||
-$(RM) $@ | -$(RM) $@ | |||
$(STATICLIB_LINK) $@ $^ | $(STATICLIB_LINK) $@ $^ | |||
#___________________________________________________________________________ | #___________________________________________________________________________ | |||
# gpre_boot | # gpre_boot | |||
# | # | |||
skipping to change at line 548 | skipping to change at line 569 | |||
cross_rest: qli gbak_files | cross_rest: qli gbak_files | |||
$(MAKE) $(BUILD_FILE) | $(MAKE) $(BUILD_FILE) | |||
qli: $(QLI) | qli: $(QLI) | |||
$(QLI): $(QLI_Objects) $(COMMON_LIB) | $(QLI): $(QLI_Objects) $(COMMON_LIB) | |||
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_ LIBS) | $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_ LIBS) | |||
examples: include_generic | examples: include_generic | |||
$(MAKE) -f Makefile.examples -C $(GEN_ROOT)/examples/ | $(MAKE) -f Makefile.examples -C $(GEN_ROOT)/examples/ | |||
$(MAKE) -f Makefile.plugins_examples -C $(GEN_ROOT)/examples/ | $(MAKE) -f Makefile.plugins_examples | |||
message_file: $(FIREBIRD_MSG) | message_file: $(FIREBIRD_MSG) | |||
$(FIREBIRD_MSG): $(BUILD_FILE) msg.timestamp | $(FIREBIRD_MSG): $(BUILD_FILE) msg.timestamp | |||
$(BUILD_FILE) -d msg.fdb -f $@ | $(BUILD_FILE) -d msg.fdb -f $@ | |||
$(CHMOD_6) $@ | $(CHMOD_6) $@ | |||
$(BUILD_FILE): $(BUILD_Objects) $(COMMON_LIB) | $(BUILD_FILE): $(BUILD_Objects) $(COMMON_LIB) | |||
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_ LIBS) | $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_ LIBS) | |||
skipping to change at line 717 | skipping to change at line 738 | |||
$(RM) $(SRC_ROOT)/include/gen/autoconfig.h | $(RM) $(SRC_ROOT)/include/gen/autoconfig.h | |||
clean_gpre_gen: | clean_gpre_gen: | |||
-$(RM) -f `find $(TMP_ROOT)/ -type f -name '*.cpp' -print` | -$(RM) -f `find $(TMP_ROOT)/ -type f -name '*.cpp' -print` | |||
clean_yacc_gen: | clean_yacc_gen: | |||
$(RM) $(ROOT)/src/dsql/parse.cpp $(ROOT)/src/dsql/dsql.tab.h | $(RM) $(ROOT)/src/dsql/parse.cpp $(ROOT)/src/dsql/dsql.tab.h | |||
#___________________________________________________________________________ | #___________________________________________________________________________ | |||
# Extra platform specific targets | # Extra platform specific targets | |||
@POSTFIX_INCLUDE@ | ||||
End of changes. 8 change blocks. | ||||
5 lines changed or deleted | 27 lines changed or added |