mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Reviewed, optimized and simplified make clean and distclean; tidied up the rpm building; removed obsolete stlocaltz.sh file
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@23480 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero
parent
4dab485c21
commit
aec6bd0d0e
23 changed files with 158 additions and 123 deletions
87
ChangeLog
87
ChangeLog
|
|
@ -1,3 +1,90 @@
|
|||
2006-09-13 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
* Master/rpm.make: Put the generated files (file-list, spec files)
|
||||
into GNUSTEP_OBJ_DIR. Use the same name for both debug and
|
||||
non-debug spec files. Depend on GNUSTEP_OBJ_DIR being created
|
||||
before the files.
|
||||
(internal-distclean): Rule removed. The generated files are now
|
||||
in GNUSTEP_OBJ_DIR and so are automatically deleted on make clean.
|
||||
|
||||
* Master/rpm.make (specfile): Set gs_file_list variable in the
|
||||
spec file. Renamed FILE_LIST to GNUSTEP_FILE_LIST to protect it
|
||||
from collisions with user makefiles.
|
||||
* spec-rules.template: Replaced hardcoded file-list name with
|
||||
gs_file_list variable.
|
||||
* spec-debug-rules.template: Same change.
|
||||
|
||||
2006-09-13 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
* Master/clibrary.make (internal-clean): Do nothing if there are
|
||||
no PSWRAP_C_FILES or PSWRAP_H_FILES to remove.
|
||||
* Master/library.make (internal-clean): Same change.
|
||||
* Master/subproject.make (internal-clean): Same change.
|
||||
* Master/test-library.make (internal-clean): Same change.
|
||||
|
||||
* Master/rules.make (internal-distclean): Do not remove 'core'.
|
||||
(PACKAGE_NAME): Use normal assignement.
|
||||
|
||||
2006-09-13 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
* setlocaltz.sh: Obsolete file removed.
|
||||
|
||||
2006-09-13 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
* Master/application.make (internal-clean): Do not remove obj
|
||||
(already done in Master/rules.make).
|
||||
* Master/bundle.make (internal-clean): Same change.
|
||||
* Master/clibrary.make (internal-clean): Same change.
|
||||
* Master/ctool.make (internal-clean): Same change.
|
||||
* Master/gswapp.make (internal-clean): Same change.
|
||||
* Master/gswbundle.make (internal-clean): Same change.
|
||||
* Master/library.make (internal-clean): Same change.
|
||||
* Master/objc.make (internal-clean): Same change.
|
||||
* Master/palette.make (internal-clean): Same change.
|
||||
* Master/service.make (internal-clean): Same change.
|
||||
* Master/subproject.make (internal-clean): Same change.
|
||||
* Master/test-application.make (internal-clean): Same change.
|
||||
* Master/test-library.make (internal-clean): Same change.
|
||||
* Master/test-tool.make (internal-clean): Same change.
|
||||
* Master/tool.make (internal-clean): Same change.
|
||||
* Instance/framework.make (internal-framework-clean): Same change.
|
||||
|
||||
2006-09-13 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
* Master/application.make (internal-distclean): Do not remove obj
|
||||
(already done by clean). Remove *.app only if not flattened, else
|
||||
do nothing because if we're flattened this is already done by
|
||||
clean.
|
||||
* Master/gswapp.make (internal-distclean): Do not remove obj and
|
||||
remove *.gswa only if non flattened, else do nothing.
|
||||
* Master/palette.make (internal-distclean): Do not remove obj
|
||||
and remove *.palette only if non flattened, else do nothing.
|
||||
* Master/service.make (internal-distclean): Do not remove obj and
|
||||
remove *.service only if non flattened, else do nothing.
|
||||
* Master/test-application.make (internal-distclean): Do not remove
|
||||
obj and remove *.app only if non flattened, else do nothing.
|
||||
|
||||
* Master/bundle.make (internal-distclean): Do nothing.
|
||||
* Master/clibrary.make (internal-distclean): Do nothing.
|
||||
* Master/ctool.make (internal-distclean): Do nothing.
|
||||
* Master/gswbundle.make (internal-distclean): Do nothing.
|
||||
* Master/library.make (internal-distclean): Do nothing.
|
||||
* Master/objc.make (internal-distclean): Do nothing.
|
||||
* Master/palette.make (internal-distclean): Do nothing.
|
||||
* Master/subproject.make (internal-distclean): Do nothing.
|
||||
* Master/test-library.make (internal-distclean): Do nothing.
|
||||
* Master/test-tool.make (internal-distclean): Do nothing.
|
||||
* Master/tool.make (internal-distclean): Do nothing (still remove
|
||||
Resources if we have them though).
|
||||
* Instance/framework.make (internal-framework-distclean): Do
|
||||
nothing.
|
||||
|
||||
2006-09-13 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
* Master/source-distribution.make: Use ECHO_NOTHING and
|
||||
END_ECHO macros so that 'make messages=yes dist' and
|
||||
similar commands work properly.
|
||||
|
||||
2006-09-13 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
* Master/rpm.make: Always build a file list called 'file-list'
|
||||
|
|
|
|||
|
|
@ -694,12 +694,10 @@ endif
|
|||
# Cleaning targets
|
||||
#
|
||||
internal-framework-clean::
|
||||
$(ECHO_NOTHING)rm -rf $(GNUSTEP_OBJ_DIR) \
|
||||
$(ECHO_NOTHING)rm -rf \
|
||||
$(PSWRAP_C_FILES) $(PSWRAP_H_FILES) \
|
||||
$(FRAMEWORK_DIR) $(DERIVED_SOURCES_DIR)$(END_ECHO)
|
||||
|
||||
internal-framework-distclean::
|
||||
$(ECHO_NOTHING)cd $(GNUSTEP_BUILD_DIR); \
|
||||
rm -rf obj$(END_ECHO)
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/Instance/Shared/strings.make
|
||||
|
|
|
|||
|
|
@ -44,16 +44,16 @@ _PLIST_INFO_FILES = $(addsuffix Info.plist,$(foreach app,$(APP_NAME),$(patsubst
|
|||
internal-clean::
|
||||
ifeq ($(GNUSTEP_FLATTENED),)
|
||||
(cd $(GNUSTEP_BUILD_DIR); \
|
||||
rm -rf $(GNUSTEP_OBJ_DIR_NAME) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) \
|
||||
$(_PLIST_INFO_FILES) *.$(APP_EXTENSION)/$(GNUSTEP_TARGET_LDIR))
|
||||
rm -rf $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) $(_PLIST_INFO_FILES) *.$(APP_EXTENSION)/$(GNUSTEP_TARGET_LDIR))
|
||||
else
|
||||
(cd $(GNUSTEP_BUILD_DIR); \
|
||||
rm -rf $(GNUSTEP_OBJ_DIR_NAME) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) \
|
||||
$(_PLIST_INFO_FILES) *.$(APP_EXTENSION))
|
||||
rm -rf $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) $(_PLIST_INFO_FILES) *.$(APP_EXTENSION))
|
||||
endif
|
||||
|
||||
internal-distclean::
|
||||
(cd $(GNUSTEP_BUILD_DIR); rm -rf obj *.app)
|
||||
ifeq ($(GNUSTEP_FLATTENED),)
|
||||
(cd $(GNUSTEP_BUILD_DIR); rm -rf *.$(APP_EXTENSION))
|
||||
endif
|
||||
|
||||
# The following make trick extracts all tools in APP_NAME for which
|
||||
# the xxx_SUBPROJECTS variable is set to something non-empty.
|
||||
|
|
|
|||
|
|
@ -38,11 +38,9 @@ _PSWRAP_H_FILES = $(foreach bundle,$(BUNDLE_NAME),$($(bundle)_PSWRAP_FILES:.psw=
|
|||
|
||||
internal-clean::
|
||||
(cd $(GNUSTEP_BUILD_DIR); \
|
||||
rm -rf $(GNUSTEP_OBJ_DIR_NAME) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) \
|
||||
$(addsuffix $(BUNDLE_EXTENSION),$(BUNDLE_NAME)))
|
||||
rm -rf $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) $(addsuffix $(BUNDLE_EXTENSION),$(BUNDLE_NAME)))
|
||||
|
||||
internal-distclean::
|
||||
(cd $(GNUSTEP_BUILD_DIR); rm -rf obj)
|
||||
|
||||
BUNDLES_WITH_SUBPROJECTS = $(strip $(foreach bundle,$(BUNDLE_NAME),$(patsubst %,$(bundle),$($(bundle)_SUBPROJECTS))))
|
||||
|
||||
|
|
|
|||
|
|
@ -37,11 +37,12 @@ _PSWRAP_C_FILES = $(foreach lib,$(CLIBRARY_NAME),$($(lib)_PSWRAP_FILES:.psw=.c))
|
|||
_PSWRAP_H_FILES = $(foreach lib,$(CLIBRARY_NAME),$($(lib)_PSWRAP_FILES:.psw=.h))
|
||||
|
||||
internal-clean::
|
||||
ifneq ($(_PSWRAP_C_FILES)$(_PSWRAP_H_FILES),)
|
||||
(cd $(GNUSTEP_BUILD_DIR); \
|
||||
rm -rf $(GNUSTEP_OBJ_DIR_NAME) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES))
|
||||
rm -rf $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES))
|
||||
endif
|
||||
|
||||
internal-distclean::
|
||||
(cd $(GNUSTEP_BUILD_DIR); rm -rf obj)
|
||||
|
||||
CLIBRARIES_WITH_SUBPROJECTS = $(strip $(foreach clibrary,$(CLIBRARY_NAME),$(patsubst %,$(clibrary),$($(clibrary)_SUBPROJECTS))))
|
||||
ifneq ($(CLIBRARIES_WITH_SUBPROJECTS),)
|
||||
|
|
|
|||
|
|
@ -33,10 +33,8 @@ internal-install:: $(CTOOL_NAME:=.install.ctool.variables)
|
|||
internal-uninstall:: $(CTOOL_NAME:=.uninstall.ctool.variables)
|
||||
|
||||
internal-clean::
|
||||
rm -rf $(GNUSTEP_OBJ_DIR)
|
||||
|
||||
internal-distclean::
|
||||
(cd $(GNUSTEP_BUILD_DIR); rm -rf obj)
|
||||
|
||||
CTOOLS_WITH_SUBPROJECTS = $(strip $(foreach ctool,$(CTOOL_NAME),$(patsubst %,$(ctool),$($(ctool)_SUBPROJECTS))))
|
||||
ifneq ($(CTOOLS_WITH_SUBPROJECTS),)
|
||||
|
|
|
|||
|
|
@ -40,15 +40,17 @@ internal-uninstall:: $(GSWAPP_NAME:=.uninstall.gswapp.variables)
|
|||
internal-clean::
|
||||
ifeq ($(GNUSTEP_FLATTENED),)
|
||||
(cd $(GNUSTEP_BUILD_DIR); \
|
||||
rm -rf $(GNUSTEP_OBJ_DIR_NAME) \
|
||||
*.$(GSWAPP_EXTENSION)/$(GNUSTEP_TARGET_LDIR))
|
||||
rm -rf *.$(GSWAPP_EXTENSION)/$(GNUSTEP_TARGET_LDIR))
|
||||
else
|
||||
(cd $(GNUSTEP_BUILD_DIR); \
|
||||
rm -rf $(GNUSTEP_OBJ_DIR_NAME) *.$(GSWAPP_EXTENSION))
|
||||
rm -rf *.$(GSWAPP_EXTENSION))
|
||||
endif
|
||||
|
||||
internal-distclean::
|
||||
(cd $(GNUSTEP_BUILD_DIR); rm -rf obj *.gswa)
|
||||
ifeq ($(GNUSTEP_FLATTENED),)
|
||||
(cd $(GNUSTEP_BUILD_DIR); \
|
||||
rm -rf *.$(GSWAPP_EXTENSION))
|
||||
endif
|
||||
|
||||
GSWAPPS_WITH_SUBPROJECTS = $(strip $(foreach gswapp,$(GSWAPP_NAME),$(patsubst %,$(gswapp),$($(gswapp)_SUBPROJECTS))))
|
||||
ifneq ($(GSWAPPS_WITH_SUBPROJECTS),)
|
||||
|
|
|
|||
|
|
@ -39,11 +39,9 @@ internal-uninstall:: $(GSWBUNDLE_NAME:=.uninstall.gswbundle.variables)
|
|||
|
||||
internal-clean::
|
||||
(cd $(GNUSTEP_BUILD_DIR); \
|
||||
rm -rf $(GNUSTEP_OBJ_DIR_NAME) \
|
||||
$(addsuffix $(GSWBUNDLE_EXTENSION),$(GSWBUNDLE_NAME)))
|
||||
rm -rf $(addsuffix $(GSWBUNDLE_EXTENSION),$(GSWBUNDLE_NAME)))
|
||||
|
||||
internal-distclean::
|
||||
(CD $(GNUSTEP_BUILD_DIR); rm -rf obj)
|
||||
|
||||
GSWBUNDLES_WITH_SUBPROJECTS = $(strip $(foreach gswbundle,$(GSWBUNDLE_NAME),$(patsubst %,$(gswbundle),$($(gswbundle)_SUBPROJECTS))))
|
||||
ifneq ($(GSWBUNDLES_WITH_SUBPROJECTS),)
|
||||
|
|
|
|||
|
|
@ -37,11 +37,12 @@ _PSWRAP_C_FILES = $(foreach lib,$(LIBRARY_NAME),$($(lib)_PSWRAP_FILES:.psw=.c))
|
|||
_PSWRAP_H_FILES = $(foreach lib,$(LIBRARY_NAME),$($(lib)_PSWRAP_FILES:.psw=.h))
|
||||
|
||||
internal-clean::
|
||||
ifneq ($(_PSWRAP_C_FILES)$(_PSWRAP_H_FILES),)
|
||||
(cd $(GNUSTEP_BUILD_DIR); \
|
||||
rm -rf $(GNUSTEP_OBJ_DIR_NAME) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES))
|
||||
rm -rf $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES))
|
||||
endif
|
||||
|
||||
internal-distclean::
|
||||
(cd $(GNUSTEP_BUILD_DIR); rm -rf obj)
|
||||
|
||||
LIBRARIES_WITH_SUBPROJECTS = $(strip $(foreach library,$(LIBRARY_NAME),$(patsubst %,$(library),$($(library)_SUBPROJECTS))))
|
||||
ifneq ($(LIBRARIES_WITH_SUBPROJECTS),)
|
||||
|
|
|
|||
|
|
@ -33,10 +33,8 @@ internal-install:: $(OBJC_PROGRAM_NAME:=.install.objc-program.variables)
|
|||
internal-uninstall:: $(OBJC_PROGRAM_NAME:=.uninstall.objc-program.variables)
|
||||
|
||||
internal-clean::
|
||||
rm -rf $(GNUSTEP_OBJ_DIR)
|
||||
|
||||
internal-distclean::
|
||||
(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),)
|
||||
|
|
|
|||
|
|
@ -40,16 +40,16 @@ _PSWRAP_H_FILES = $(foreach palette,$(PALETTE_NAME),$($(palette)_PSWRAP_FILES:.p
|
|||
internal-clean::
|
||||
ifeq ($(GNUSTEP_FLATTENED),)
|
||||
(cd $(GNUSTEP_BUILD_DIR); \
|
||||
rm -rf $(GNUSTEP_OBJ_DIR_NAME) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) \
|
||||
*.palette/$(GNUSTEP_TARGET_LDIR))
|
||||
rm -rf $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) *.palette/$(GNUSTEP_TARGET_LDIR))
|
||||
else
|
||||
(cd $(GNUSTEP_BUILD_DIR); \
|
||||
rm -rf $(GNUSTEP_OBJ_DIR_NAME) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) \
|
||||
*.palette)
|
||||
rm -rf $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) *.palette)
|
||||
endif
|
||||
|
||||
internal-distclean::
|
||||
(cd $(GNUSTEP_BUILD_DIR); rm -rf obj *.palette)
|
||||
ifeq ($(GNUSTEP_FLATTENED),)
|
||||
(cd $(GNUSTEP_BUILD_DIR); rm -rf *.palette)
|
||||
endif
|
||||
|
||||
PALETTES_WITH_SUBPROJECTS = $(strip $(foreach palette,$(PALETTE_NAME),$(patsubst %,$(palette),$($(palette)_SUBPROJECTS))))
|
||||
ifneq ($(PALETTES_WITH_SUBPROJECTS),)
|
||||
|
|
|
|||
|
|
@ -189,17 +189,17 @@
|
|||
# we are being called inside the rpm installation stage, and we need
|
||||
# to produce the file list from the installed files.
|
||||
|
||||
GNUSTEP_FILE_LIST = $(GNUSTEP_OBJ_DIR)/file-list
|
||||
|
||||
ifeq ($(filelist),yes)
|
||||
|
||||
# Build the file-list only at top level
|
||||
# ifeq ($(MAKELEVEL),0)
|
||||
|
||||
FILE_LIST = $(shell pwd)/file-list
|
||||
|
||||
# Remove the old file list before installing, and initialize the new one.
|
||||
before-install::
|
||||
$(ECHO_NOTHING)rm -f $(FILE_LIST)$(END_ECHO)
|
||||
$(ECHO_NOTHING)echo "%attr (-, root, root)" >> $(FILE_LIST)$(END_ECHO)
|
||||
$(ECHO_NOTHING)rm -f $(GNUSTEP_FILE_LIST)$(END_ECHO)
|
||||
$(ECHO_NOTHING)echo "%attr (-, root, root)" >> $(GNUSTEP_FILE_LIST)$(END_ECHO)
|
||||
|
||||
# install - done by other GNUmakefiles - NB: must install everything inside
|
||||
# GNUSTEP_INSTALLATION_DIR, or prefix all installation dirs with
|
||||
|
|
@ -213,28 +213,31 @@ ifeq ($(filelist),yes)
|
|||
if [ -d "$$file" ]; then \
|
||||
echo "%dir $$file" > /dev/null; \
|
||||
else \
|
||||
echo "$$file" >> $(FILE_LIST); \
|
||||
echo "$$file" >> $(GNUSTEP_FILE_LIST); \
|
||||
fi; \
|
||||
done$(END_ECHO)
|
||||
$(ECHO_NOTHING)sed -e "s|$(INSTALL_ROOT_DIR)||" $(FILE_LIST) > file-list.tmp$(END_ECHO)
|
||||
$(ECHO_NOTHING)mv file-list.tmp $(FILE_LIST)$(END_ECHO)
|
||||
$(ECHO_NOTHING)sed -e "s|$(INSTALL_ROOT_DIR)||" $(GNUSTEP_FILE_LIST) > file-list.tmp$(END_ECHO)
|
||||
$(ECHO_NOTHING)mv file-list.tmp $(GNUSTEP_FILE_LIST)$(END_ECHO)
|
||||
|
||||
# endif # MAKELEVEL
|
||||
|
||||
endif # filelist == yes
|
||||
|
||||
# NB: The filelist is automatically deleted when GNUSTEP_OBJ_DIR is
|
||||
# deleted (that is, by make clean)
|
||||
|
||||
#
|
||||
# Manage debug vs non-debug
|
||||
#
|
||||
SPEC_FILE_NAME=$(PACKAGE_NAME).spec
|
||||
SPEC_FILE=$(GNUSTEP_OBJ_DIR)/$(SPEC_FILE_NAME)
|
||||
|
||||
ifneq ($(debug), yes)
|
||||
SPEC_FILE=$(PACKAGE_NAME).spec
|
||||
SPEC_RULES_TEMPLATE=$(GNUSTEP_MAKEFILES)/spec-rules.template
|
||||
SPEC_IN=$(PACKAGE_NAME).spec.in
|
||||
SPEC_SCRIPT_IN=$(PACKAGE_NAME).script.spec.in
|
||||
PACKAGE_EXTENSION=""
|
||||
else
|
||||
SPEC_FILE=$(PACKAGE_NAME)-debug.spec
|
||||
SPEC_RULES_TEMPLATE=$(GNUSTEP_MAKEFILES)/spec-debug-rules.template
|
||||
SPEC_IN=$(PACKAGE_NAME)-debug.spec.in
|
||||
SPEC_SCRIPT_IN=$(PACKAGE_NAME)-debug.script.spec.in
|
||||
|
|
@ -260,7 +263,7 @@ $(PACKAGE_NAME)-debug.spec.in:
|
|||
#
|
||||
# This is the real target - depends on having a correct .spec.in file
|
||||
#
|
||||
$(SPEC_FILE): $(SPEC_IN)
|
||||
$(SPEC_FILE): $(SPEC_IN) $(GNUSTEP_OBJ_DIR)
|
||||
$(ECHO_NOTHING)echo "Generating the spec file..."$(END_ECHO)
|
||||
$(ECHO_NOTHING)rm -f $@$(END_ECHO)
|
||||
$(ECHO_NOTHING)echo "##" >> $@$(END_ECHO)
|
||||
|
|
@ -273,6 +276,7 @@ $(SPEC_FILE): $(SPEC_IN)
|
|||
$(ECHO_NOTHING)echo "%define gs_install_dir $(GNUSTEP_INSTALLATION_DIR)" >> $@$(END_ECHO)
|
||||
$(ECHO_NOTHING)echo "%define gs_name $(PACKAGE_NAME)" >> $@$(END_ECHO)
|
||||
$(ECHO_NOTHING)echo "%define gs_version $(PACKAGE_VERSION)" >> $@$(END_ECHO)
|
||||
$(ECHO_NOTHING)echo "%define gs_file_list $(GNUSTEP_FILE_LIST)" >> $@$(END_ECHO)
|
||||
ifeq ($(PACKAGE_NEEDS_CONFIGURE),YES)
|
||||
$(ECHO_NOTHING)echo "%define gs_configure YES" >> $@$(END_ECHO)
|
||||
else
|
||||
|
|
@ -334,9 +338,4 @@ endif
|
|||
rpmbuild="rpmbuild"; \
|
||||
fi; \
|
||||
fi; \
|
||||
$${rpmbuild} -ba $(SPEC_FILE)$(END_ECHO)
|
||||
|
||||
ifneq ($(PACKAGE_NAME),)
|
||||
internal-distclean::
|
||||
$(ECHO_NOTHING)rm -rf $(PACKAGE_NAME).spec $(PACKAGE_NAME)-debug.spec$(END_ECHO)
|
||||
endif
|
||||
$${rpmbuild} -ba $(SPEC_FILE_NAME)$(END_ECHO)
|
||||
|
|
|
|||
|
|
@ -166,7 +166,6 @@ after-clean::
|
|||
before-distclean::
|
||||
|
||||
internal-distclean::
|
||||
rm -f $(GNUSTEP_BUILD_DIR)/core
|
||||
|
||||
after-distclean::
|
||||
|
||||
|
|
@ -410,7 +409,7 @@ PACKAGE_NAME := $(strip $(PACKAGE_NAME))
|
|||
|
||||
ifeq ($(PACKAGE_NAME),)
|
||||
# Use a default of unnamed-package if nothing better is provided.
|
||||
PACKAGE_NAME := unnamed-package
|
||||
PACKAGE_NAME = unnamed-package
|
||||
endif
|
||||
|
||||
# For backwards compatibility, take value of PACKAGE_VERSION from
|
||||
|
|
|
|||
|
|
@ -39,16 +39,16 @@ _PSWRAP_H_FILES = $(foreach service,$(SERVICE_NAME),$($(service)_PSWRAP_FILES:.p
|
|||
internal-clean::
|
||||
ifeq ($(GNUSTEP_FLATTENED),)
|
||||
(cd $(GNUSTEP_BUILD_DIR); \
|
||||
rm -rf $(GNUSTEP_OBJ_DIR_NAME) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) \
|
||||
*.service/$(GNUSTEP_TARGET_LDIR))
|
||||
rm -rf $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) *.service/$(GNUSTEP_TARGET_LDIR))
|
||||
else
|
||||
(cd $(GNUSTEP_BUILD_DIR); \
|
||||
rm -rf $(GNUSTEP_OBJ_DIR_NAME) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) \
|
||||
*.service)
|
||||
rm -rf $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) *.service)
|
||||
endif
|
||||
|
||||
internal-distclean::
|
||||
(cd $(GNUSTEP_BUILD_DIR); rm -rf obj *.service)
|
||||
ifeq ($(GNUSTEP_FLATTENED),)
|
||||
(cd $(GNUSTEP_BUILD_DIR); rm -rf *.service)
|
||||
endif
|
||||
|
||||
SERVICES_WITH_SUBPROJECTS = $(strip $(foreach service,$(SERVICE_NAME),$(patsubst %,$(service),$($(service)_SUBPROJECTS))))
|
||||
ifneq ($(SERVICES_WITH_SUBPROJECTS),)
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@ VERTAG = $(subst .,_,$(PACKAGE_VERSION))
|
|||
# Build a .tar.gz with the whole directory tree
|
||||
#
|
||||
dist: distclean
|
||||
@echo "Generating $(ARCHIVE_FILE) in the parent directory..."; \
|
||||
$(ECHO_NOTHING)echo "Generating $(ARCHIVE_FILE) in the parent directory..."; \
|
||||
SNAPSHOT_DIR=`basename $$(pwd)`; \
|
||||
if [ "$$SNAPSHOT_DIR" != "$(VERSION_NAME)" ]; then \
|
||||
if [ -d "../$(VERSION_NAME)" ]; then \
|
||||
|
|
@ -178,9 +178,9 @@ dist: distclean
|
|||
if [ ! -f $(ARCHIVE_FILE) ]; then \
|
||||
echo "*Error* creating .tar$(COMPRESSION_EXT) archive"; \
|
||||
exit 1; \
|
||||
fi;
|
||||
fi;$(END_ECHO)
|
||||
ifneq ($(RELEASE_DIR),)
|
||||
@echo "Moving $(ARCHIVE_FILE) to $(RELEASE_DIR)..."; \
|
||||
$(ECHO_NOTHING)echo "Moving $(ARCHIVE_FILE) to $(RELEASE_DIR)..."; \
|
||||
if [ ! -d $(RELEASE_DIR) ]; then \
|
||||
$(MKDIRS) $(RELEASE_DIR); \
|
||||
fi; \
|
||||
|
|
@ -190,7 +190,7 @@ ifneq ($(RELEASE_DIR),)
|
|||
mv $(RELEASE_DIR)/$(ARCHIVE_FILE) \
|
||||
$(RELEASE_DIR)/$(ARCHIVE_FILE)~;\
|
||||
fi; \
|
||||
mv ../$(ARCHIVE_FILE) $(RELEASE_DIR)
|
||||
mv ../$(ARCHIVE_FILE) $(RELEASE_DIR)$(END_ECHO)
|
||||
endif
|
||||
|
||||
#
|
||||
|
|
@ -213,7 +213,7 @@ svn-snapshot: EXPORT_SVN_NAME = trunk
|
|||
svn-snapshot: internal-svn-export
|
||||
|
||||
internal-svn-export:
|
||||
@echo "Exporting from module $(SVN_MODULE_NAME) on SVN..."; \
|
||||
$(ECHO_NOTHING)echo "Exporting from module $(SVN_MODULE_NAME) on SVN..."; \
|
||||
if [ -e $(SVN_MODULE_NAME) ]; then \
|
||||
echo "*Error* cannot export: $(SVN_MODULE_NAME) already exists"; \
|
||||
exit 1; \
|
||||
|
|
@ -236,9 +236,9 @@ internal-svn-export:
|
|||
if [ ! -f $(ARCHIVE_FILE) ]; then \
|
||||
echo "*Error* creating .tar$(COMPRESSION_EXT) archive"; \
|
||||
exit 1; \
|
||||
fi;
|
||||
fi;$(END_ECHO)
|
||||
ifneq ($(RELEASE_DIR),)
|
||||
@echo "Moving $(ARCHIVE_FILE) to $(RELEASE_DIR)..."; \
|
||||
$(ECHO_NOTHING)echo "Moving $(ARCHIVE_FILE) to $(RELEASE_DIR)..."; \
|
||||
if [ ! -d $(RELEASE_DIR) ]; then \
|
||||
$(MKDIRS) $(RELEASE_DIR); \
|
||||
fi; \
|
||||
|
|
@ -248,7 +248,7 @@ ifneq ($(RELEASE_DIR),)
|
|||
mv $(RELEASE_DIR)/$(ARCHIVE_FILE) \
|
||||
$(RELEASE_DIR)/$(ARCHIVE_FILE)~;\
|
||||
fi; \
|
||||
mv $(ARCHIVE_FILE) $(RELEASE_DIR)
|
||||
mv $(ARCHIVE_FILE) $(RELEASE_DIR)$(END_ECHO)
|
||||
endif
|
||||
|
||||
#
|
||||
|
|
@ -271,7 +271,7 @@ cvs-snapshot: EXPORT_CVS_FLAGS = -D now
|
|||
cvs-snapshot: internal-cvs-export
|
||||
|
||||
internal-cvs-export:
|
||||
@echo "Exporting from module $(CVS_MODULE_NAME) on CVS..."; \
|
||||
$(ECHO_NOTHING)echo "Exporting from module $(CVS_MODULE_NAME) on CVS..."; \
|
||||
if [ -e $(CVS_MODULE_NAME) ]; then \
|
||||
echo "*Error* cannot export: $(CVS_MODULE_NAME) already exists"; \
|
||||
exit 1; \
|
||||
|
|
@ -295,9 +295,9 @@ internal-cvs-export:
|
|||
if [ ! -f $(ARCHIVE_FILE) ]; then \
|
||||
echo "*Error* creating .tar$(COMPRESSION_EXT) archive"; \
|
||||
exit 1; \
|
||||
fi;
|
||||
fi;$(END_ECHO)
|
||||
ifneq ($(RELEASE_DIR),)
|
||||
@echo "Moving $(ARCHIVE_FILE) to $(RELEASE_DIR)..."; \
|
||||
$(ECHO_NOTHING)echo "Moving $(ARCHIVE_FILE) to $(RELEASE_DIR)..."; \
|
||||
if [ ! -d $(RELEASE_DIR) ]; then \
|
||||
$(MKDIRS) $(RELEASE_DIR); \
|
||||
fi; \
|
||||
|
|
@ -307,7 +307,7 @@ ifneq ($(RELEASE_DIR),)
|
|||
mv $(RELEASE_DIR)/$(ARCHIVE_FILE) \
|
||||
$(RELEASE_DIR)/$(ARCHIVE_FILE)~;\
|
||||
fi; \
|
||||
mv $(ARCHIVE_FILE) $(RELEASE_DIR)
|
||||
mv $(ARCHIVE_FILE) $(RELEASE_DIR)$(END_ECHO)
|
||||
endif
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -52,11 +52,12 @@ _PSWRAP_C_FILES = $($(SUBPROJECT_NAME)_PSWRAP_FILES:.psw=.c)
|
|||
_PSWRAP_H_FILES = $($(SUBPROJECT_NAME)_PSWRAP_FILES:.psw=.h)
|
||||
|
||||
internal-clean::
|
||||
ifneq ($(_PSWRAP_C_FILES)$(_PSWRAP_H_FILES),)
|
||||
(cd $(GNUSTEP_BUILD_DIR); \
|
||||
rm -rf $(GNUSTEP_OBJ_DIR_NAME) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES))
|
||||
rm -rf $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES))
|
||||
endif
|
||||
|
||||
internal-distclean::
|
||||
(cd $(GNUSTEP_BUILD_DIR); rm -rf obj)
|
||||
|
||||
|
||||
SUBPROJECTS_WITH_SUBPROJECTS = $(strip $(patsubst %,$(SUBPROJECT_NAME),$($(SUBPROJECT_NAME)_SUBPROJECTS)))
|
||||
|
|
|
|||
|
|
@ -35,16 +35,16 @@ _PSWRAP_H_FILES = $(foreach app,$(TEST_APP_NAME),$($(app)_PSWRAP_FILES:.psw=.h))
|
|||
internal-clean::
|
||||
ifeq ($(GNUSTEP_FLATTENED),)
|
||||
(cd $(GNUSTEP_BUILD_DIR); \
|
||||
rm -rf $(GNUSTEP_OBJ_DIR_NAME) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) \
|
||||
*.$(APP_EXTENSION)/$(GNUSTEP_TARGET_LDIR))
|
||||
rm -rf $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) *.$(APP_EXTENSION)/$(GNUSTEP_TARGET_LDIR))
|
||||
else
|
||||
(cd $(GNUSTEP_BUILD_DIR); \
|
||||
rm -rf $(GNUSTEP_OBJ_DIR_NAME) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) \
|
||||
*.$(APP_EXTENSION))
|
||||
rm -rf $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) *.$(APP_EXTENSION))
|
||||
endif
|
||||
|
||||
internal-distclean::
|
||||
(cd $(GNUSTEP_BUILD_DIR); rm -rf obj *.app)
|
||||
ifeq ($(GNUSTEP_FLATTENED),)
|
||||
(cd $(GNUSTEP_BUILD_DIR); rm -rf *.$(APP_EXTENSION))
|
||||
endif
|
||||
|
||||
TEST_APPS_WITH_SUBPROJECTS = $(strip $(foreach test-app,$(TEST_APP_NAME),$(patsubst %,$(test-app),$($(test-app)_SUBPROJECTS))))
|
||||
ifneq ($(TEST_APPS_WITH_SUBPROJECTS),)
|
||||
|
|
|
|||
|
|
@ -37,11 +37,12 @@ _PSWRAP_C_FILES = $(foreach lib,$(TEST_LIBRARY_NAME),$($(lib)_PSWRAP_FILES:.psw=
|
|||
_PSWRAP_H_FILES = $(foreach lib,$(TEST_LIBRARY_NAME),$($(lib)_PSWRAP_FILES:.psw=.h))
|
||||
|
||||
internal-clean::
|
||||
ifneq ($(_PSWRAP_C_FILES)$(_PSWRAP_H_FILES),)
|
||||
(cd $(GNUSTEP_BUILD_DIR); \
|
||||
rm -rf $(GNUSTEP_OBJ_DIR_NAME) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES))
|
||||
rm -rf $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES))
|
||||
endif
|
||||
|
||||
internal-distclean::
|
||||
(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),)
|
||||
|
|
|
|||
|
|
@ -29,10 +29,8 @@ endif
|
|||
internal-all:: $(TEST_TOOL_NAME:=.all.test-tool.variables)
|
||||
|
||||
internal-clean::
|
||||
rm -rf $(GNUSTEP_OBJ_DIR)
|
||||
|
||||
internal-distclean::
|
||||
(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),)
|
||||
|
|
|
|||
|
|
@ -33,10 +33,8 @@ internal-install:: $(TOOL_NAME:=.install.tool.variables)
|
|||
internal-uninstall:: $(TOOL_NAME:=.uninstall.tool.variables)
|
||||
|
||||
internal-clean::
|
||||
rm -rf $(GNUSTEP_OBJ_DIR)
|
||||
|
||||
internal-distclean::
|
||||
(cd $(GNUSTEP_BUILD_DIR); rm -rf obj)
|
||||
|
||||
TOOLS_WITH_SUBPROJECTS = $(strip $(foreach tool,$(TOOL_NAME),$(patsubst %,$(tool),$($(tool)_SUBPROJECTS))))
|
||||
ifneq ($(TOOLS_WITH_SUBPROJECTS),)
|
||||
|
|
|
|||
|
|
@ -1,42 +0,0 @@
|
|||
#! /bin/sh
|
||||
#
|
||||
# setlocaltz.sh
|
||||
#
|
||||
# Determine local timezone, ask user for input, save timzone
|
||||
# in GNUstep timezone file (or defaults database)
|
||||
#
|
||||
# Copyright (C) 1999 Free Software Foundation, Inc.
|
||||
#
|
||||
# Author: Scott Christley <scottc@net-community.com>
|
||||
#
|
||||
# Date: February 1999
|
||||
#
|
||||
# This file is part of the GNUstep Makefile Package.
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
# as published by the Free Software Foundation; either version 2
|
||||
# of the License, or (at your option) any later version.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public
|
||||
# License along with this library; see the file COPYING.LIB.
|
||||
# If not, write to the Free Software Foundation,
|
||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
echo " "
|
||||
echo "Enter the name of your timezone file"
|
||||
echo "press ^D on its own line when you are done"
|
||||
TZNAME=`cat`
|
||||
echo " "
|
||||
|
||||
GNUSTEP_TIMEZONE=$GNUSTEP_SYSTEM_ROOT/Library/Libraries/Resources/gnustep-base/NSTimeZones
|
||||
if [ -f $GNUSTEP_TIMEZONE/zones/$TZNAME ]; then
|
||||
echo Setting timezone to $TZNAME
|
||||
defaults write NSGlobalDomain "Local Time Zone" $TZNAME
|
||||
echo defaults database says local time zone is:
|
||||
defaults read NSGlobalDomain "Local Time Zone"
|
||||
else
|
||||
echo ERROR: Cannot find timezone file: $TZNAME
|
||||
echo in $GNUSTEP_TIMEZONE/zones
|
||||
exit 1
|
||||
fi
|
||||
|
|
@ -37,4 +37,4 @@ rm -rf $RPM_BUILD_ROOT
|
|||
#
|
||||
# File list (generated by install)
|
||||
#
|
||||
%files -f file-list
|
||||
%files -f %{gs_file_list}
|
||||
|
|
|
|||
|
|
@ -37,4 +37,4 @@ rm -rf $RPM_BUILD_ROOT
|
|||
#
|
||||
# File list (generated by install)
|
||||
#
|
||||
%files -f file-list
|
||||
%files -f %{gs_file_list}
|
||||
|
|
|
|||
Loading…
Reference in a new issue