| From 8fa9f201df10cee4f5f21d9d439798de8f433d8d Mon Sep 17 00:00:00 2001 |
| From: Alexpux <alexey.pawlow@gmail.com> |
| Date: Sat, 22 Nov 2014 22:59:59 +0300 |
| Subject: [PATCH 15/27] Add missing sources for utils building. |
| |
| --- |
| builds/posix/Makefile.in.client.gsec | 2 +- |
| builds/posix/Makefile.in.client.util | 4 ++-- |
| builds/posix/Makefile.in.embed.util | 8 ++++---- |
| builds/posix/Makefile.in.fbtrace | 2 +- |
| 4 files changed, 8 insertions(+), 8 deletions(-) |
| |
| diff --git a/builds/posix/Makefile.in.client.gsec b/builds/posix/Makefile.in.client.gsec |
| index 2efa520f3a..803ea4f71f 100644 |
| --- a/builds/posix/Makefile.in.client.gsec |
| +++ b/builds/posix/Makefile.in.client.gsec |
| @@ -29,7 +29,7 @@ include $(ROOT)/gen/make.shared.variables |
| |
| @SET_MAKE@ |
| |
| -GSEC_Other_Sources = jrd/isc_file.cpp jrd/ThreadData.cpp common/UtilSvc.cpp jrd/enc.cpp \ |
| +GSEC_Other_Sources = jrd/isc.cpp jrd/isc_file.cpp jrd/ThreadData.cpp common/UtilSvc.cpp jrd/enc.cpp \ |
| jrd/sha.cpp jrd/guid.cpp |
| GSEC_Files = gsec.cpp call_service.cpp gsecMain.cpp security.cpp |
| GSEC_Sources = $(addprefix utilities/gsec/, $(GSEC_Files)) $(GSEC_Other_Sources) |
| diff --git a/builds/posix/Makefile.in.client.util b/builds/posix/Makefile.in.client.util |
| index dab8911753..70bfab7901 100644 |
| --- a/builds/posix/Makefile.in.client.util |
| +++ b/builds/posix/Makefile.in.client.util |
| @@ -40,14 +40,14 @@ include $(ROOT)/gen/make.shared.variables |
| @SET_MAKE@ |
| |
| |
| -LOCKPRINT_Other_Sources = jrd/isc_sync.cpp jrd/isc.cpp jrd/db_alias.cpp \ |
| +LOCKPRINT_Other_Sources = jrd/isc_ipc.cpp jrd/isc_sync.cpp jrd/isc.cpp jrd/db_alias.cpp \ |
| common/config/config.cpp common/config/config_file.cpp $(OS_SPECIFIC_Sources) |
| LOCKPRINT_Files= print.cpp |
| LOCKPRINT_Sources = $(addprefix lock/, $(LOCKPRINT_Files)) $(LOCKPRINT_Other_Sources) |
| LOCKPRINT_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(LOCKPRINT_Sources)))) \ |
| $(FBCONFIG_Objects) |
| |
| -NBACKUP_Other_Sources = jrd/isc_file.cpp jrd/db_alias.cpp common/UtilSvc.cpp $(OS_SPECIFIC_Sources) |
| +NBACKUP_Other_Sources = jrd/isc.cpp jrd/isc_file.cpp jrd/db_alias.cpp common/UtilSvc.cpp $(OS_SPECIFIC_Sources) |
| NBACKUP_Files= nbackup.cpp nbackup/nbkMain.cpp |
| NBACKUP_Sources = $(addprefix utilities/, $(NBACKUP_Files)) $(NBACKUP_Other_Sources) |
| NBACKUP_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(NBACKUP_Sources)))) \ |
| diff --git a/builds/posix/Makefile.in.embed.util b/builds/posix/Makefile.in.embed.util |
| index 3d1a98fbb7..8488a05473 100644 |
| --- a/builds/posix/Makefile.in.embed.util |
| +++ b/builds/posix/Makefile.in.embed.util |
| @@ -40,7 +40,7 @@ include $(ROOT)/gen/make.shared.variables |
| @SET_MAKE@ |
| |
| |
| -LOCKPRINT_Other_Sources += jrd/isc_sync.cpp jrd/isc.cpp jrd/db_alias.cpp \ |
| +LOCKPRINT_Other_Sources += jrd/isc_ipc.cpp jrd/isc_sync.cpp jrd/isc.cpp jrd/db_alias.cpp \ |
| $(OS_SPECIFIC_Sources) |
| |
| LOCKPRINT_Files= print.cpp |
| @@ -48,7 +48,7 @@ LOCKPRINT_Sources = $(addprefix lock/, $(LOCKPRINT_Files)) $(LOCKPRINT_Other_Sou |
| LOCKPRINT_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(LOCKPRINT_Sources)))) \ |
| $(FBCONFIG_Objects) |
| |
| -NBACKUP_Other_Sources = jrd/isc_file.cpp jrd/db_alias.cpp common/UtilSvc.cpp $(OS_SPECIFIC_Sources) |
| +NBACKUP_Other_Sources = jrd/isc.cpp jrd/isc_file.cpp jrd/db_alias.cpp common/UtilSvc.cpp $(OS_SPECIFIC_Sources) |
| |
| NBACKUP_Files= nbackup.cpp nbackup/nbkMain.cpp |
| NBACKUP_Sources = $(addprefix utilities/, $(NBACKUP_Files)) $(NBACKUP_Other_Sources) |
| @@ -65,7 +65,7 @@ DROP_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(DROP_Sources))) |
| |
| |
| GSEC_Other_Sources = jrd/enc.cpp jrd/sha.cpp jrd/guid.cpp \ |
| -jrd/isc_file.cpp common/config/config.cpp common/config/config_file.cpp \ |
| +jrd/isc.cpp jrd/isc_file.cpp common/config/config.cpp common/config/config_file.cpp \ |
| common/config/dir_list.cpp \ |
| common/UtilSvc.cpp jrd/ThreadData.cpp \ |
| $(OS_SPECIFIC_Sources) |
| @@ -76,7 +76,7 @@ GSEC_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GSEC_Sources))) |
| |
| |
| GSTAT_Other_Sources = jrd/btn.cpp jrd/db_alias.cpp common/utils.cpp jrd/ods.cpp \ |
| -common/UtilSvc.cpp jrd/ThreadData.cpp jrd/isc_file.cpp $(OS_SPECIFIC_Sources) |
| +common/UtilSvc.cpp jrd/ThreadData.cpp jrd/isc.cpp jrd/isc_file.cpp $(OS_SPECIFIC_Sources) |
| |
| GSTAT_Files = dba.epp ppg.cpp gstatMain.cpp |
| GSTAT_Sources = $(addprefix utilities/gstat/, $(GSTAT_Files)) $(GSTAT_Other_Sources) |
| diff --git a/builds/posix/Makefile.in.fbtrace b/builds/posix/Makefile.in.fbtrace |
| index 0f1a09ec2b..daee0d8954 100644 |
| --- a/builds/posix/Makefile.in.fbtrace |
| +++ b/builds/posix/Makefile.in.fbtrace |
| @@ -49,7 +49,7 @@ FBTRACE_UTIL_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(FBTRACE |
| |
| |
| FBTRACE_OTHER_Sources = $(OS_SPECIFIC_Sources) $(TRACE_OS_Sources) \ |
| - jrd/isc.cpp jrd/isc_file.cpp jrd/CharSet.cpp jrd/TextType.cpp \ |
| + jrd/isc.cpp jrd/isc_file.cpp jrd/isc_sync.cpp jrd/CharSet.cpp jrd/TextType.cpp \ |
| jrd/IntlUtil.cpp jrd/unicode_util.cpp common/classes/ClumpletReader.cpp common/utils.cpp |
| |
| FBTRACE_OTHER_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(FBTRACE_OTHER_Sources)))) |
| -- |
| 2.13.0 |
| |
