mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Use the same obj directory for building no matter what type of build we're doing
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@23431 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero
parent
3cda36cb88
commit
3e2a966690
19 changed files with 51 additions and 85 deletions
31
ChangeLog
31
ChangeLog
|
|
@ -1,3 +1,34 @@
|
|||
2006-09-08 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
Object files are now all placed into ./obj rather than in separate
|
||||
directories (./shared_obj, ./shared_debug_obj,
|
||||
./static_profile_obj, etc.).
|
||||
* common.make (OBJ_DIR_PREFIX): Variable removed.
|
||||
(GNUSTEP_OBJ_PREFIX): Variable removed.
|
||||
(GNUSTEP_OBJ_DIR_NAME): Hardcode 'obj' as the prefix of the
|
||||
directory name.
|
||||
* rules.make ($(GNUSTEP_OBJ_DIR)): Do not create the symlink from
|
||||
./shared_obj to ./obj. Just create GNUSTEP_OBJ_DIR.
|
||||
|
||||
* Master/application.make (internal-distclean): Only remove
|
||||
'./obj', not the various './shared_obj', etc.
|
||||
* Master/bundle.make (internal-distclean): Same change.
|
||||
* Master/clibrary.make (internal-distclean): Same change.
|
||||
* Master/ctool.make (internal-distclean): Same change.
|
||||
* Master/gswapp.make (internal-distclean): Same change.
|
||||
* Master/gswbundle.make (internal-distclean): Same change.
|
||||
* Master/library.make (internal-distclean): Same change.
|
||||
* Master/objc.make (internal-distclean): Same change.
|
||||
* Master/palette.make (internal-distclean): Same change.
|
||||
* Master/service.make (internal-distclean): Same change.
|
||||
* Master/subproject.make (internal-distclean): Same change.
|
||||
* Master/test-application.make (internal-distclean): Same change.
|
||||
* Master/test-library.make (internal-distclean): Same change.
|
||||
* Master/test-tool.make (internal-distclean): Same change.
|
||||
* Master/tool.make (internal-distclean): Same change.
|
||||
|
||||
* Instance/framework.make (internal-framework-distclean): Same change.
|
||||
|
||||
2006-09-08 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
* Instance/library.make: Removed all usages of LIBRARY_NAME_SUFFIX,
|
||||
|
|
|
|||
|
|
@ -700,8 +700,6 @@ internal-framework-clean::
|
|||
|
||||
internal-framework-distclean::
|
||||
$(ECHO_NOTHING)cd $(GNUSTEP_BUILD_DIR); \
|
||||
rm -rf shared_obj static_obj shared_debug_obj \
|
||||
shared_profile_obj static_debug_obj static_profile_obj \
|
||||
shared_profile_debug_obj static_profile_debug_obj$(END_ECHO)
|
||||
rm -rf obj$(END_ECHO)
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/Instance/Shared/strings.make
|
||||
|
|
|
|||
|
|
@ -53,10 +53,7 @@ else
|
|||
endif
|
||||
|
||||
internal-distclean::
|
||||
(cd $(GNUSTEP_BUILD_DIR); \
|
||||
rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \
|
||||
static_debug_obj static_profile_obj shared_profile_debug_obj \
|
||||
static_profile_debug_obj *.app *.debug *.profile)
|
||||
(cd $(GNUSTEP_BUILD_DIR); rm -rf obj *.app *.debug *.profile)
|
||||
|
||||
# The following make trick extracts all tools in APP_NAME for which
|
||||
# the xxx_SUBPROJECTS variable is set to something non-empty.
|
||||
|
|
|
|||
|
|
@ -42,10 +42,7 @@ internal-clean::
|
|||
$(addsuffix $(BUNDLE_EXTENSION),$(BUNDLE_NAME)))
|
||||
|
||||
internal-distclean::
|
||||
(cd $(GNUSTEP_BUILD_DIR); \
|
||||
rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \
|
||||
static_debug_obj static_profile_obj shared_profile_debug_obj \
|
||||
static_profile_debug_obj)
|
||||
(cd $(GNUSTEP_BUILD_DIR); rm -rf obj)
|
||||
|
||||
BUNDLES_WITH_SUBPROJECTS = $(strip $(foreach bundle,$(BUNDLE_NAME),$(patsubst %,$(bundle),$($(bundle)_SUBPROJECTS))))
|
||||
|
||||
|
|
|
|||
|
|
@ -41,10 +41,7 @@ internal-clean::
|
|||
rm -rf $(GNUSTEP_OBJ_DIR_NAME) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES))
|
||||
|
||||
internal-distclean::
|
||||
(cd $(GNUSTEP_BUILD_DIR); \
|
||||
rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \
|
||||
static_debug_obj static_profile_obj shared_profile_debug_obj \
|
||||
static_profile_debug_obj)
|
||||
(cd $(GNUSTEP_BUILD_DIR); rm -rf obj)
|
||||
|
||||
CLIBRARIES_WITH_SUBPROJECTS = $(strip $(foreach clibrary,$(CLIBRARY_NAME),$(patsubst %,$(clibrary),$($(clibrary)_SUBPROJECTS))))
|
||||
ifneq ($(CLIBRARIES_WITH_SUBPROJECTS),)
|
||||
|
|
|
|||
|
|
@ -36,10 +36,7 @@ internal-clean::
|
|||
rm -rf $(GNUSTEP_OBJ_DIR)
|
||||
|
||||
internal-distclean::
|
||||
(cd $(GNUSTEP_BUILD_DIR); \
|
||||
rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \
|
||||
static_debug_obj static_profile_obj shared_profile_debug_obj \
|
||||
static_profile_debug_obj)
|
||||
(cd $(GNUSTEP_BUILD_DIR); rm -rf obj)
|
||||
|
||||
CTOOLS_WITH_SUBPROJECTS = $(strip $(foreach ctool,$(CTOOL_NAME),$(patsubst %,$(ctool),$($(ctool)_SUBPROJECTS))))
|
||||
ifneq ($(CTOOLS_WITH_SUBPROJECTS),)
|
||||
|
|
|
|||
|
|
@ -56,10 +56,7 @@ else
|
|||
endif
|
||||
|
||||
internal-distclean::
|
||||
(cd $(GNUSTEP_BUILD_DIR); \
|
||||
rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \
|
||||
static_debug_obj static_profile_obj shared_profile_debug_obj \
|
||||
static_profile_debug_obj *.gswa *.debug *.profile)
|
||||
(cd $(GNUSTEP_BUILD_DIR); rm -rf obj *.gswa *.debug *.profile)
|
||||
|
||||
GSWAPPS_WITH_SUBPROJECTS = $(strip $(foreach gswapp,$(GSWAPP_NAME),$(patsubst %,$(gswapp),$($(gswapp)_SUBPROJECTS))))
|
||||
ifneq ($(GSWAPPS_WITH_SUBPROJECTS),)
|
||||
|
|
|
|||
|
|
@ -43,10 +43,7 @@ internal-clean::
|
|||
$(addsuffix $(GSWBUNDLE_EXTENSION),$(GSWBUNDLE_NAME)))
|
||||
|
||||
internal-distclean::
|
||||
(CD $(GNUSTEP_BUILD_DIR); \
|
||||
rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \
|
||||
static_debug_obj static_profile_obj shared_profile_debug_obj \
|
||||
static_profile_debug_obj)
|
||||
(CD $(GNUSTEP_BUILD_DIR); rm -rf obj)
|
||||
|
||||
GSWBUNDLES_WITH_SUBPROJECTS = $(strip $(foreach gswbundle,$(GSWBUNDLE_NAME),$(patsubst %,$(gswbundle),$($(gswbundle)_SUBPROJECTS))))
|
||||
ifneq ($(GSWBUNDLES_WITH_SUBPROJECTS),)
|
||||
|
|
|
|||
|
|
@ -41,10 +41,7 @@ internal-clean::
|
|||
rm -rf $(GNUSTEP_OBJ_DIR_NAME) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES))
|
||||
|
||||
internal-distclean::
|
||||
(cd $(GNUSTEP_BUILD_DIR); \
|
||||
rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \
|
||||
static_debug_obj static_profile_obj shared_profile_debug_obj \
|
||||
static_profile_debug_obj)
|
||||
(cd $(GNUSTEP_BUILD_DIR); rm -rf obj)
|
||||
|
||||
LIBRARIES_WITH_SUBPROJECTS = $(strip $(foreach library,$(LIBRARY_NAME),$(patsubst %,$(library),$($(library)_SUBPROJECTS))))
|
||||
ifneq ($(LIBRARIES_WITH_SUBPROJECTS),)
|
||||
|
|
|
|||
|
|
@ -36,10 +36,7 @@ internal-clean::
|
|||
rm -rf $(GNUSTEP_OBJ_DIR)
|
||||
|
||||
internal-distclean::
|
||||
(cd $(GNUSTEP_BUILD_DIR); \
|
||||
rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \
|
||||
static_debug_obj static_profile_obj shared_profile_debug_obj \
|
||||
static_profile_debug_obj)
|
||||
(cd $(GNUSTEP_BUILD_DIR); rm -rf obj)
|
||||
|
||||
OBJC_PROGRAMS_WITH_SUBPROJECTS = $(strip $(foreach objc_program,$(OBJC_PROGRAM_NAME),$(patsubst %,$(objc_program),$($(objc_program)_SUBPROJECTS))))
|
||||
ifneq ($(OBJC_PROGRAMS_WITH_SUBPROJECTS),)
|
||||
|
|
|
|||
|
|
@ -49,10 +49,7 @@ else
|
|||
endif
|
||||
|
||||
internal-distclean::
|
||||
(cd $(GNUSTEP_BUILD_DIR); \
|
||||
rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \
|
||||
static_debug_obj static_profile_obj shared_profile_debug_obj \
|
||||
static_profile_debug_obj *.palette)
|
||||
(cd $(GNUSTEP_BUILD_DIR); rm -rf obj *.palette)
|
||||
|
||||
PALETTES_WITH_SUBPROJECTS = $(strip $(foreach palette,$(PALETTE_NAME),$(patsubst %,$(palette),$($(palette)_SUBPROJECTS))))
|
||||
ifneq ($(PALETTES_WITH_SUBPROJECTS),)
|
||||
|
|
|
|||
|
|
@ -48,10 +48,7 @@ else
|
|||
endif
|
||||
|
||||
internal-distclean::
|
||||
(cd $(GNUSTEP_BUILD_DIR); \
|
||||
rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \
|
||||
static_debug_obj static_profile_obj shared_profile_debug_obj \
|
||||
static_profile_debug_obj *.service)
|
||||
(cd $(GNUSTEP_BUILD_DIR); rm -rf obj *.service)
|
||||
|
||||
SERVICES_WITH_SUBPROJECTS = $(strip $(foreach service,$(SERVICE_NAME),$(patsubst %,$(service),$($(service)_SUBPROJECTS))))
|
||||
ifneq ($(SERVICES_WITH_SUBPROJECTS),)
|
||||
|
|
|
|||
|
|
@ -56,10 +56,8 @@ internal-clean::
|
|||
rm -rf $(GNUSTEP_OBJ_DIR_NAME) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES))
|
||||
|
||||
internal-distclean::
|
||||
(cd $(GNUSTEP_BUILD_DIR); \
|
||||
rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \
|
||||
static_debug_obj static_profile_obj shared_profile_debug_obj \
|
||||
static_profile_debug_obj)
|
||||
(cd $(GNUSTEP_BUILD_DIR); rm -rf obj)
|
||||
|
||||
|
||||
SUBPROJECTS_WITH_SUBPROJECTS = $(strip $(patsubst %,$(SUBPROJECT_NAME),$($(SUBPROJECT_NAME)_SUBPROJECTS)))
|
||||
ifneq ($(SUBPROJECTS_WITH_SUBPROJECTS),)
|
||||
|
|
|
|||
|
|
@ -44,10 +44,7 @@ else
|
|||
endif
|
||||
|
||||
internal-distclean::
|
||||
(cd $(GNUSTEP_BUILD_DIR); \
|
||||
rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \
|
||||
static_debug_obj static_profile_obj shared_profile_debug_obj \
|
||||
static_profile_debug_obj *.app *.debug *.profile)
|
||||
(cd $(GNUSTEP_BUILD_DIR); rm -rf obj *.app *.debug *.profile)
|
||||
|
||||
TEST_APPS_WITH_SUBPROJECTS = $(strip $(foreach test-app,$(TEST_APP_NAME),$(patsubst %,$(test-app),$($(test-app)_SUBPROJECTS))))
|
||||
ifneq ($(TEST_APPS_WITH_SUBPROJECTS),)
|
||||
|
|
|
|||
|
|
@ -41,10 +41,7 @@ internal-clean::
|
|||
rm -rf $(GNUSTEP_OBJ_DIR_NAME) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES))
|
||||
|
||||
internal-distclean::
|
||||
(cd $(GNUSTEP_BUILD_DIR); \
|
||||
rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \
|
||||
static_debug_obj static_profile_obj shared_profile_debug_obj \
|
||||
static_profile_debug_obj)
|
||||
(cd $(GNUSTEP_BUILD_DIR); rm -rf obj)
|
||||
|
||||
TEST_LIBRARIES_WITH_SUBPROJECTS = $(strip $(foreach test-library,$(TEST_LIBRARY_NAME),$(patsubst %,$(test-library),$($(test-library)_SUBPROJECTS))))
|
||||
ifneq ($(TEST_LIBRARIES_WITH_SUBPROJECTS),)
|
||||
|
|
|
|||
|
|
@ -32,10 +32,7 @@ internal-clean::
|
|||
rm -rf $(GNUSTEP_OBJ_DIR)
|
||||
|
||||
internal-distclean::
|
||||
(cd $(GNUSTEP_BUILD_DIR); \
|
||||
rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \
|
||||
static_debug_obj static_profile_obj shared_profile_debug_obj \
|
||||
static_profile_debug_obj)
|
||||
(cd $(GNUSTEP_BUILD_DIR); rm -rf obj)
|
||||
|
||||
TEST_TOOLS_WITH_SUBPROJECTS = $(strip $(foreach test-tool,$(TEST_TOOL_NAME),$(patsubst %,$(test-tool),$($(test-tool)_SUBPROJECTS))))
|
||||
ifneq ($(TEST_TOOLS_WITH_SUBPROJECTS),)
|
||||
|
|
|
|||
|
|
@ -36,10 +36,7 @@ internal-clean::
|
|||
rm -rf $(GNUSTEP_OBJ_DIR)
|
||||
|
||||
internal-distclean::
|
||||
(cd $(GNUSTEP_BUILD_DIR); \
|
||||
rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \
|
||||
static_debug_obj static_profile_obj shared_profile_debug_obj \
|
||||
static_profile_debug_obj)
|
||||
(cd $(GNUSTEP_BUILD_DIR); rm -rf obj)
|
||||
|
||||
TOOLS_WITH_SUBPROJECTS = $(strip $(foreach tool,$(TOOL_NAME),$(patsubst %,$(tool),$($(tool)_SUBPROJECTS))))
|
||||
ifneq ($(TOOLS_WITH_SUBPROJECTS),)
|
||||
|
|
|
|||
18
common.make
18
common.make
|
|
@ -380,7 +380,6 @@ endif
|
|||
# what can be done about it.
|
||||
OBJCFLAGS = -fno-strict-aliasing
|
||||
CFLAGS =
|
||||
OBJ_DIR_PREFIX =
|
||||
|
||||
# If the compiler supports native ObjC exceptions and the user wants us to
|
||||
# use them, turn them on!
|
||||
|
|
@ -421,13 +420,11 @@ endif
|
|||
|
||||
ifeq ($(shared), yes)
|
||||
LIB_LINK_CMD = $(SHARED_LIB_LINK_CMD)
|
||||
OBJ_DIR_PREFIX += shared_
|
||||
INTERNAL_OBJCFLAGS += $(SHARED_CFLAGS)
|
||||
INTERNAL_CFLAGS += $(SHARED_CFLAGS)
|
||||
AFTER_INSTALL_LIBRARY_CMD = $(AFTER_INSTALL_SHARED_LIB_CMD)
|
||||
else
|
||||
LIB_LINK_CMD = $(STATIC_LIB_LINK_CMD)
|
||||
OBJ_DIR_PREFIX += static_
|
||||
AFTER_INSTALL_LIBRARY_CMD = $(AFTER_INSTALL_STATIC_LIB_CMD)
|
||||
endif
|
||||
|
||||
|
|
@ -436,20 +433,16 @@ ifeq ($(profile), yes)
|
|||
ifeq ($(LD), $(CC))
|
||||
INTERNAL_LDFLAGS += -pg
|
||||
endif
|
||||
OBJ_DIR_PREFIX += profile_
|
||||
endif
|
||||
|
||||
ifeq ($(debug), yes)
|
||||
OPTFLAG := $(filter-out -O%, $(OPTFLAG))
|
||||
ADDITIONAL_FLAGS += -g -Wall -DDEBUG -fno-omit-frame-pointer
|
||||
INTERNAL_JAVACFLAGS += -g -deprecation
|
||||
OBJ_DIR_PREFIX += debug_
|
||||
else
|
||||
INTERNAL_JAVACFLAGS += -O
|
||||
endif
|
||||
|
||||
OBJ_DIR_PREFIX += obj
|
||||
|
||||
ifeq ($(warn), no)
|
||||
ADDITIONAL_FLAGS += -UGSWARN
|
||||
else
|
||||
|
|
@ -470,14 +463,9 @@ INTERNAL_OBJCFLAGS += $(ADDITIONAL_FLAGS) $(OPTFLAG) $(OBJCFLAGS) \
|
|||
$(RUNTIME_FLAG)
|
||||
INTERNAL_CFLAGS += $(ADDITIONAL_FLAGS) $(OPTFLAG)
|
||||
|
||||
# trick needed to replace a space with nothing
|
||||
empty:=
|
||||
space:= $(empty) $(empty)
|
||||
GNUSTEP_OBJ_PREFIX = $(subst $(space),,$(OBJ_DIR_PREFIX))
|
||||
|
||||
#
|
||||
# Support building of Multiple Architecture Binaries (MAB). The object files
|
||||
# directory will be something like shared_obj/ix86_m68k_sun/
|
||||
# directory will be something like obj/ix86_m68k_sun/
|
||||
#
|
||||
ifeq ($(arch),)
|
||||
ARCH_OBJ_DIR = $(GNUSTEP_TARGET_DIR)
|
||||
|
|
@ -487,9 +475,9 @@ else
|
|||
endif
|
||||
|
||||
ifeq ($(GNUSTEP_FLATTENED),)
|
||||
GNUSTEP_OBJ_DIR_NAME = $(GNUSTEP_OBJ_PREFIX)/$(ARCH_OBJ_DIR)/$(LIBRARY_COMBO)
|
||||
GNUSTEP_OBJ_DIR_NAME = obj/$(ARCH_OBJ_DIR)/$(LIBRARY_COMBO)
|
||||
else
|
||||
GNUSTEP_OBJ_DIR_NAME = $(GNUSTEP_OBJ_PREFIX)
|
||||
GNUSTEP_OBJ_DIR_NAME = obj
|
||||
endif
|
||||
|
||||
GNUSTEP_OBJ_DIR = $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_OBJ_DIR_NAME)
|
||||
|
|
|
|||
|
|
@ -564,15 +564,8 @@ endif
|
|||
|
||||
# The rule to create the objects file directory.
|
||||
$(GNUSTEP_OBJ_DIR):
|
||||
ifeq ($(HAS_LN_S),no)
|
||||
$(ECHO_NOTHING)cd $(GNUSTEP_BUILD_DIR); \
|
||||
$(MKDIRS) ./$(GNUSTEP_OBJ_DIR_NAME)$(END_ECHO)
|
||||
else
|
||||
$(ECHO_NOTHING)cd $(GNUSTEP_BUILD_DIR); \
|
||||
$(MKDIRS) ./$(GNUSTEP_OBJ_DIR_NAME); \
|
||||
$(RM_LN_S) obj; \
|
||||
$(LN_S) ./$(GNUSTEP_OBJ_DIR_NAME) obj$(END_ECHO)
|
||||
endif
|
||||
|
||||
endif
|
||||
# rules.make loaded
|
||||
|
|
|
|||
Loading…
Reference in a new issue