mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-01-23 08:03:04 +01:00
Fixing merge
This commit is contained in:
parent
2b2cf1d2b2
commit
b0a7a9064b
@ -68,8 +68,8 @@ DROP_Sources = $(addprefix utilities/, $(DROP_Files)) $(DROP_Other_Sources)
|
||||
DROP_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(DROP_Sources))))
|
||||
|
||||
|
||||
GSTAT_Other_Sources = jrd/btn.cpp jrd/db_alias.cpp jrd/ods.cpp \
|
||||
common/utils.cpp $(OS_SPECIFIC_Sources) jrd/ThreadData.cpp common/UtilSvc.cpp
|
||||
GSTAT_Other_Sources = jrd/btn.cpp jrd/db_alias.cpp jrd/ods.cpp common/utils.cpp \
|
||||
$(OS_SPECIFIC_Sources) jrd/isc_file.cpp jrd/ThreadData.cpp common/UtilSvc.cpp
|
||||
|
||||
GSTAT_Files = dba.epp ppg.cpp gstatMain.cpp
|
||||
GSTAT_Sources = $(addprefix utilities/gstat/, $(GSTAT_Files)) $(GSTAT_Other_Sources)
|
||||
|
Loading…
Reference in New Issue
Block a user