Removed old obsolete iconheader/NeXT code

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@17831 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2003-10-13 11:06:51 +00:00
parent 8506d5c134
commit f809db345a
7 changed files with 17 additions and 29 deletions

View file

@ -1,3 +1,15 @@
Mon Oct 13 12:55:50 2003 Nicola Pero <n.pero@mi.flashnet.it>
* Master/application.make (internal-distclean): Do not remove
.iconheader files, no longer used.
* Master/gswapp.make (internal-clean, internal-distclean): Do not
remove .iconheader files.
(internal-clean): Obsolete code removed.
* Master/service.make (internal-clean): Same changes.
* Master/test-application.make (internal-clean,
internal-disclean): Same changes.
* Instance/gswapp.make: Removed obsolete iconheader code.
Mon Oct 13 12:25:50 2003 Nicola Pero <n.pero@mi.flashnet.it>
* Master/palette.make (internal-clean): Remove objects inside

View file

@ -106,7 +106,7 @@ ifeq ($(FOUNDATION_LIB), apple)
>$(APP_DIR_NAME)/library_paths.openapp$(END_ECHO)
else
$(ECHO_NOTHING)$(TRANSFORM_PATHS_SCRIPT) $(subst -L,,$(ALL_LIB_DIRS)) \
>$(APP_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/library_paths.openapp$(END_ECHO)
>$(APP_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/library_paths.openapp$(END_ECHO)
endif
#

View file

@ -119,12 +119,9 @@ $(GSWAPP_FILE): $(OBJ_FILES_TO_LINK)
ifeq ($(FOUNDATION_LIB), apple)
$(ECHO_NOTHING)$(TRANSFORM_PATHS_SCRIPT) $(subst -L,,$(ALL_LIB_DIRS)) \
>$(GSWAPP_DIR_NAME)/library_paths.openapp$(END_ECHO)
# This is a hack for OPENSTEP systems to remove the iconheader file
# automatically generated by the makefile package.
$(ECHO_NOTHING)rm -f $(GNUSTEP_INSTANCE).iconheader$(END_ECHO)
else
$(ECHO_NOTHING)$(TRANSFORM_PATHS_SCRIPT) $(subst -L,,$(ALL_LIB_DIRS)) \
>$(GSWAPP_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/library_paths.openapp$(END_ECHO)
>$(GSWAPP_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/library_paths.openapp$(END_ECHO)
endif
#

View file

@ -52,7 +52,7 @@ endif
internal-distclean::
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 *.iconheader
static_profile_debug_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.

View file

@ -47,23 +47,16 @@ internal-uninstall:: $(GSWAPP_NAME:=.uninstall.gswapp.variables)
internal-clean::
rm -rf $(GNUSTEP_OBJ_DIR)
ifeq ($(OBJC_COMPILER), NeXT)
rm -f *.iconheader
for f in *.$(GSWAPP_EXTENSION); do \
rm -f $$f/`basename $$f .$(GSWAPP_EXTENSION)`; \
done
else
ifeq ($(GNUSTEP_FLATTENED),)
rm -rf *.$(GSWAPP_EXTENSION)/$(GNUSTEP_TARGET_LDIR)
else
rm -rf *.$(GSWAPP_EXTENSION)
endif
endif
internal-distclean::
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 *.iconheader
static_profile_debug_obj *.gswa *.debug *.profile
GSWAPPS_WITH_SUBPROJECTS = $(strip $(foreach gswapp,$(GSWAPP_NAME),$(patsubst %,$(gswapp),$($(gswapp)_SUBPROJECTS))))
ifneq ($(GSWAPPS_WITH_SUBPROJECTS),)

View file

@ -38,18 +38,11 @@ _PSWRAP_H_FILES = $(foreach service,$(SERVICE_NAME),$($(service)_PSWRAP_FILES:.p
internal-clean::
rm -rf $(GNUSTEP_OBJ_DIR) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES)
ifeq ($(OBJC_COMPILER), NeXT)
rm -f *.iconheader
for f in *.service; do \
rm -f $$f/`basename $$f .service`; \
done
else
ifeq ($(GNUSTEP_FLATTENED),)
rm -rf *.service/$(GNUSTEP_TARGET_LDIR)
else
rm -rf *.service
endif
endif
internal-distclean::
rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \

View file

@ -34,23 +34,16 @@ _PSWRAP_H_FILES = $(foreach app,$(TEST_APP_NAME),$($(app)_PSWRAP_FILES:.psw=.h))
internal-clean::
rm -rf $(GNUSTEP_OBJ_DIR) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES)
ifeq ($(OBJC_COMPILER), NeXT)
rm -f *.iconheader
for f in *.$(APP_EXTENSION); do \
rm -f $$f/`basename $$f .$(APP_EXTENSION)`; \
done
else
ifeq ($(GNUSTEP_FLATTENED),)
rm -rf *.$(APP_EXTENSION)/$(GNUSTEP_TARGET_LDIR)
else
rm -rf *.$(APP_EXTENSION)
endif
endif
internal-distclean::
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 *.iconheader
static_profile_debug_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),)