Utilize object directory for apps.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@2440 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
scottc 1997-09-23 22:46:56 +00:00
parent 69b17b97a4
commit d5db869572
4 changed files with 25 additions and 11 deletions

View file

@ -1,4 +1,10 @@
Tue Sep 23 13:48:02 1997 Scott Christley <scottc@speedy.net-community.com>
Tue Sep 23 15:18:08 1997 Scott Christley <scottc@net-community.com>
* application.make: Utilize object directory.
* tool.make (object_dir): Rename to object-dir.
* library.make (object_dir): Rename to object-dir.
Tue Sep 23 13:48:02 1997 Scott Christley <scottc@net-community.com>
* DESIGN: New file.
* README: New file.
@ -8,7 +14,7 @@ Tue Sep 23 13:48:02 1997 Scott Christley <scottc@speedy.net-community.com>
* target.make: Remove unneeded code.
* tool.make: Put the stamps in the object directory.
Mon Sep 22 17:57:50 1997 Scott Christley <scottc@speedy.net-community.com>
Mon Sep 22 17:57:50 1997 Scott Christley <scottc@net-community.com>
* common.make: Add support for putting object files in a different
directory.
@ -17,6 +23,6 @@ Mon Sep 22 17:57:50 1997 Scott Christley <scottc@speedy.net-community.com>
* library.make: Add support for shared libraries.
* target.make: Likewise.
Mon Sep 22 15:12:14 1997 Scott Christley <scottc@speedy.net-community.com>
Mon Sep 22 15:12:14 1997 Scott Christley <scottc@net-community.com>
* ChangeLog: New file.

View file

@ -32,12 +32,14 @@ LINK_CMD = $(CC) $(ALL_CFLAGS) $@$(OEXT) -o $@ $(ALL_LDFLAGS)
APP_DIR_NAME := $(foreach app,$(APP_NAME),$(app).app)
APP_FILE = $(APP_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)/$(APP_NAME)$(EXEEXT)
APP_STAMPS := $(foreach app,$(APP_NAME),stamp-app-$(app))
APP_STAMPS := $(addprefix $(GNUSTEP_OBJ_DIR)/,$(APP_STAMPS))
#
# Internal targets
#
stamp-% : $(C_OBJ_FILES) $(OBJC_OBJ_FILES)
$(GNUSTEP_OBJ_DIR)/stamp-% : $(C_OBJ_FILES) $(OBJC_OBJ_FILES)
$(LD) $(ALL_LDFLAGS) $(LDOUT)$(APP_FILE) \
$(C_OBJ_FILES) $(OBJC_OBJ_FILES) \
$(ALL_LIB_DIRS) $(ALL_GUI_LIBS)
@ -48,16 +50,20 @@ stamp-% : $(C_OBJ_FILES) $(OBJC_OBJ_FILES)
#
internal-all:: $(APP_DIR_NAME)
internal-app-all:: build-app-dir build-app
internal-app-all:: build-app-dir object-dir build-app
build-app-dir::
$(GNUSTEP_MAKEFILES)/mkinstalldirs \
@$(GNUSTEP_MAKEFILES)/mkinstalldirs \
$(APP_DIR_NAME) \
$(APP_DIR_NAME)/$(GNUSTEP_TARGET_CPU) \
$(APP_DIR_NAME)/$(GNUSTEP_TARGET_DIR) \
$(APP_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)
build-app:: stamp-$(APP_NAME)
build-app:: $(GNUSTEP_OBJ_DIR)/stamp-$(APP_NAME)
object-dir::
@$(GNUSTEP_MAKEFILES)/mkinstalldirs \
./$(GNUSTEP_OBJ_DIR)
#
# Cleaning targets
@ -66,5 +72,7 @@ internal-clean::
for f in $(APP_DIR_NAME); do \
rm -rf $$f ; \
done
rm -f $(APP_STAMPS)
internal-distclean:: clean
rm -rf objs

View file

@ -39,9 +39,9 @@ SHARED_LIBRARY_FILE = $(LIBRARY_NAME)$(SHARED_LIBEXT).$(VERSION)
#
# Compilation targets
#
internal-all:: object_dir static-library shared-library import-library
internal-all:: object-dir static-library shared-library import-library
object_dir::
object-dir::
$(GNUSTEP_MAKEFILES)/mkinstalldirs \
./$(GNUSTEP_OBJ_DIR)

View file

@ -49,11 +49,11 @@ $(GNUSTEP_OBJ_DIR)/stamp-tool-% : $(C_OBJ_FILES) $(OBJC_OBJ_FILES)
#
internal-all:: $(TOOL_LIST)
internal-tool-all:: object_dir build-tool
internal-tool-all:: object-dir build-tool
build-tool:: $(GNUSTEP_OBJ_DIR)/stamp-tool-$(TOOL_NAME)
object_dir::
object-dir::
@$(GNUSTEP_MAKEFILES)/mkinstalldirs \
./$(GNUSTEP_OBJ_DIR)