gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Makefile changes to compile thinkg in place.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@3496 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 1998-12-20 21:27:47 +00:00
parent 244a7a4ff5
commit 702148406b
11 changed files with 41 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ChangeLog
View file

@ -1,3 +1,21 @@
Sat Dec 19 01:26:06 1998 Matthias Klose <doko@cs.tu-berlin.de>
* config.make.in: New macro MKDIRS defaults to
$(GNUSTEP_MAKEFILES)/mkinstalldirs.
* application.make: Use macro MKDIRS.
* bundle.make: likewise
* library.make: likewise
* documentation.make: likewise
* objc.make: likewise
* rules.make: likewise
* service.make: likewise
* tool.make: likewise
* test-library.make: likewise
Sat Dec 19 10:57:22 1998 Adam Fedor <fedor@ultra.doc.com>
* aggregate.make: Look for Makefile.
Thu Dec 17 11:42:06 1998 Adam Fedor <fedor@ultra.doc.com>
* test-library.make (ALL_TEST_LIBRARY_LIBS): Remove duplicate lib.

13
aggregate.make
View file

@ -39,13 +39,18 @@ include $(GNUSTEP_MAKEFILES)/rules.make
#
internal-all internal-install internal-uninstall internal-clean \
internal-distclean internal-check::
@(target=`echo $@ | sed 's/internal-//'`; \
@target=`echo $@ | sed 's/internal-//'`; \
for f in $(SUBPROJECTS); do \
echo Making $$target in $$f...;\
if eval "(cd $$f; $(MAKE) -f $(MAKEFILE_NAME) --no-keep-going $$target)"; then \
echo Making $$target in $$f...; \
mf=$(MAKEFILE_NAME); \
if [ ! -f $$f/$$mf -a -f $$f/Makefile ]; then \
mf=Makefile; \
echo "WARNING: No $(MAKEFILE_NAME) found for subproject $$f; using 'Makefile'"; \
fi; \
if $(MAKE) -C $$f -f $$mf --no-keep-going $$target; then \
:; else exit 1; \
fi; \
done)
done
endif
# aggregate.make loaded

8
application.make
View file

@ -140,13 +140,11 @@ before-$(TARGET)-all::
after-$(TARGET)-all::
$(APP_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO):
@$(GNUSTEP_MAKEFILES)/mkinstalldirs \
$(APP_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)
@$(MKDIRS) $(APP_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)
endif
app-resource-dir::
@$(GNUSTEP_MAKEFILES)/mkinstalldirs \
$(APP_RESOURCE_DIRS)
@$(MKDIRS) $(APP_RESOURCE_DIRS)
app-resource-files:: $(APP_DIR_NAME)/Resources/Info-gnustep.plist app-resource-dir
@(if [ "$(RESOURCE_FILES)" != "" ]; then \
@ -166,7 +164,7 @@ $(APP_DIR_NAME)/Resources/Info-gnustep.plist: $(APP_DIR_NAME)/Resources
echo "}") >$@
$(APP_DIR_NAME)/Resources:
@$(GNUSTEP_MAKEFILES)/mkinstalldirs $@
@$(MKDIRS) $@
internal-app-install::
rm -rf $(GNUSTEP_APPS)/$(APP_DIR_NAME)

4
bundle.make
View file

@ -85,7 +85,7 @@ ifeq ($(strip $(RESOURCE_FILES)),)
endif
build-bundle-dir::
@$(GNUSTEP_MAKEFILES)/mkinstalldirs \
@$(MKDIRS) \
$(BUNDLE_DIR_NAME)/Resources \
$(BUNDLE_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO) \
$(BUNDLE_RESOURCE_DIRS)
@ -126,7 +126,7 @@ internal-bundle-install:: $(BUNDLE_INSTALL_DIR)
tar cf - $(BUNDLE_DIR_NAME) | (cd $(BUNDLE_INSTALL_DIR); tar xf -)
$(BUNDLE_DIR_NAME)/Resources $(BUNDLE_INSTALL_DIR)::
@$(GNUSTEP_MAKEFILES)/mkinstalldirs $@
@$(MKDIRS) $@
internal-bundle-uninstall::
rm -rf $(BUNDLE_INSTALL_DIR)/$(BUNDLE_DIR_NAME)

1
config.make.in
View file

@ -55,6 +55,7 @@ INSTALL = @HOST_INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
TAR = tar
MKDIRS = $(GNUSTEP_MAKEFILES)/mkinstalldirs
# The default library combination
default_library_combo = @ac_cv_library_combo@

3
documentation.make
View file

@ -135,8 +135,7 @@ internal-doc-install:: internal-install-dirs
internal-textdoc-install::
internal-install-dirs::
$(GNUSTEP_MAKEFILES)/mkinstalldirs \
$(GNUSTEP_DOCUMENTATION) \
$(MKDIRS) $(GNUSTEP_DOCUMENTATION)
internal-doc-uninstall::

2
library.make
View file

@ -105,7 +105,7 @@ internal-library-install:: internal-install-dirs internal-install-lib \
internal-install-headers
internal-install-dirs::
$(GNUSTEP_MAKEFILES)/mkinstalldirs \
$(MKDIRS) \
$(GNUSTEP_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR) \
$(GNUSTEP_LIBRARIES) \
$(GNUSTEP_HEADERS)$(HEADER_FILES_INSTALL_DIR) \

2
objc.make
View file

@ -90,7 +90,7 @@ after-$(TARGET)-all::
internal-objc_program-install:: internal-install-objc-dirs install-objc_program
internal-install-objc-dirs::
$(GNUSTEP_MAKEFILES)/mkinstalldirs $(OBJC_PROGRAM_INSTALLATION_DIR)
$(MKDIRS) $(OBJC_PROGRAM_INSTALLATION_DIR)
install-objc_program::
$(INSTALL_PROGRAM) -m 0755 \

2
rules.make
View file

@ -232,7 +232,7 @@ OBJ_DIR_RULE = defined
# The rule to create the objects file directory. This rule is here so that it
# can be accessed from the global before and after targets as well.
$(GNUSTEP_OBJ_DIR):
@$(GNUSTEP_MAKEFILES)/mkinstalldirs ./$(GNUSTEP_OBJ_DIR)
@$(MKDIRS) ./$(GNUSTEP_OBJ_DIR)
endif
endif

8
service.make
View file

@ -97,12 +97,10 @@ before-$(TARGET)-all::
after-$(TARGET)-all::
$(SERVICE_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO):
@$(GNUSTEP_MAKEFILES)/mkinstalldirs \
$(SERVICE_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)
@$(MKDIRS) $(SERVICE_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)
svc-resource-dir::
@$(GNUSTEP_MAKEFILES)/mkinstalldirs \
$(SERVICE_RESOURCE_DIRS)
@$(MKDIRS) $(SERVICE_RESOURCE_DIRS)
svc-resource-files:: $(SERVICE_DIR_NAME)/Resources/Info-gnustep.plist svc-resource-dir
@(if [ "$(RESOURCE_FILES)" != "" ]; then \
@ -123,7 +121,7 @@ $(SERVICE_DIR_NAME)/Resources/Info-gnustep.plist: $(SERVICE_DIR_NAME)/Resources
if $${_d}make_services --test $@; then : ; else rm -f $@; false; fi
$(SERVICE_DIR_NAME)/Resources:
@$(GNUSTEP_MAKEFILES)/mkinstalldirs $@
@$(MKDIRS) $@
internal-svc-install::
rm -rf $(GNUSTEP_SERVICES)/$(SERVICE_DIR_NAME)

2
tool.make
View file

@ -85,7 +85,7 @@ after-$(TARGET)-all::
internal-tool-install:: internal-tool-all internal-install-dirs install-tool
internal-install-dirs::
$(GNUSTEP_MAKEFILES)/mkinstalldirs $(TOOL_INSTALLATION_DIR)
$(MKDIRS) $(TOOL_INSTALLATION_DIR)
install-tool::
$(INSTALL_PROGRAM) -m 0755 $(GNUSTEP_OBJ_DIR)/$(INTERNAL_tool_NAME)$(EXEEXT) \