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

Minor bug fixes.

Browse source 
Some additional variables defined.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@2462 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Scott Christley 1997-09-30 16:09:35 +00:00
parent 4cc10b4f1b
commit 31781131bc
7 changed files with 61 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
Tue Sep 30 08:27:28 1997 Scott Christley <scottc@net-community.com>
* Makefile.preamble (ADDITIONAL_TOOL_LIBS, ADDITIONAL_GUI_LIBS): Add
template variables for additional libraries when linking.
* application.make (internal-app-all): Build object directory.
* common.make (GNUSTEP_HEADERS_FND): New variable.
(GNUSTEP_OBJ_PREFIX): New variable.
(GNUSTEP_TARGET_LIBRARIES): New variable.
* library.make: Add uninstall targets.
* rules.make (ALL_LIB_DIRS): Search GNUSTEP_TARGET_LIBRARIES.
* tool.make (internal-clean): Remove object directory.
Fri Sep 26 13:16:03 1997 Scott Christley <scottc@net-community.com>
* Makefile.in: Define install script.

6
Makefile.preamble
View file

@ -29,6 +29,12 @@ ADDITIONAL_LDFLAGS =
# Additional library directories the linker should search
ADDITIONAL_LIB_DIRS =
# Additional libraries when linking tools
ADDITIONAL_TOOL_LIBS =
# Additional libraries when linking applications
ADDITIONAL_GUI_LIBS =
#
# Flags dealing with installing and uninstalling
#

6
application.make
View file

@ -50,7 +50,7 @@ $(GNUSTEP_OBJ_DIR)/stamp-app-% : $(C_OBJ_FILES) $(OBJC_OBJ_FILES)
#
internal-all:: $(GNUSTEP_OBJ_DIR) $(APP_DIR_NAME)
internal-app-all:: build-app-dir build-app
internal-app-all:: $(GNUSTEP_OBJ_DIR) build-app-dir build-app
build-app-dir::
@$(GNUSTEP_MAKEFILES)/mkinstalldirs \
@ -61,10 +61,6 @@ build-app-dir::
build-app:: $(GNUSTEP_OBJ_DIR)/stamp-app-$(APP_NAME)
object-dir::
@$(GNUSTEP_MAKEFILES)/mkinstalldirs \
./$(GNUSTEP_OBJ_DIR)
#
# Cleaning targets
#

24
common.make
View file

@ -69,7 +69,8 @@ GNUSTEP_TOOLS = $(GNUSTEP_SYSTEM_ROOT)/Tools
GNUSTEP_HEADERS = $(GNUSTEP_SYSTEM_ROOT)/Headers
GNUSTEP_TARGET_HEADERS = $(GNUSTEP_HEADERS)/$(GNUSTEP_TARGET_DIR)
GNUSTEP_LIBRARIES_ROOT = $(GNUSTEP_SYSTEM_ROOT)/Libraries
GNUSTEP_LIBRARIES = $(GNUSTEP_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)
GNUSTEP_TARGET_LIBRARIES = $(GNUSTEP_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
GNUSTEP_LIBRARIES = $(GNUSTEP_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
GNUSTEP_RESOURCES = $(GNUSTEP_LIBRARIES_ROOT)/Resources
GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
@ -77,12 +78,26 @@ GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
# Determine Foundation header subdirectory based upon library combo
#
ifeq ($(FOUNDATION_LIB),gnu)
GNUSTEP_HEADERS_FND = $(GNUSTEP_HEADERS)/gnustep/base
GNUSTEP_FND_DIR = gnustep/base
GNUSTEP_HEADERS_FND = $(GNUSTEP_HEADERS)/$(GNUSTEP_FND_DIR)
GNUSTEP_HEADERS_FND_FLAG = -I$(GNUSTEP_HEADERS_FND)
endif
ifeq ($(FOUNDATION_LIB),fd)
GNUSTEP_HEADERS_FND = $(GNUSTEP_HEADERS)/libFoundation
GNUSTEP_FND_DIR = libFoundation
GNUSTEP_HEADERS_FND = $(GNUSTEP_HEADERS)/$(GNUSTEP_FND_DIR)
GNUSTEP_HEADERS_FND_FLAG = -I$(GNUSTEP_HEADERS_FND)
endif
ifeq ($(FOUNDATION_LIB),nx)
GNUSTEP_FND_DIR = next
GNUSTEP_HEADERS_FND = $(GNUSTEP_HEADERS)/$(GNUSTEP_FND_DIR)
GNUSTEP_HEADERS_FND_FLAG = -I$(GNUSTEP_HEADERS_FND)
endif
ifeq ($(FOUNDATION_LIB),sun)
GNUSTEP_FND_DIR = sun
GNUSTEP_HEADERS_FND = $(GNUSTEP_HEADERS)/$(GNUSTEP_FND_DIR)
GNUSTEP_HEADERS_FND_FLAG = -I$(GNUSTEP_HEADERS_FND)
endif
@ -164,5 +179,6 @@ INTERNAL_OBJCFLAGS += $(ADDITIONAL_FLAGS) $(OPTFLAG) $(OBJCFLAGS) \
INTERNAL_CFLAGS += $(ADDITIONAL_FLAGS) $(CFLAGS) $(OPTFLAG) $(RUNTIME_FLAG)
INTERNAL_LDFLAGS += $(LDFLAGS)
GNUSTEP_OBJ_DIR = $(shell echo $(OBJ_DIR_PREFIX) | sed 's/ //g')/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)
GNUSTEP_OBJ_PREFIX = $(shell echo $(OBJ_DIR_PREFIX) | sed 's/ //g')
GNUSTEP_OBJ_DIR = $(GNUSTEP_OBJ_PREFIX)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)

21
library.make
View file

@ -63,6 +63,7 @@ internal-install-dirs::
$(GNUSTEP_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR) \
$(GNUSTEP_LIBRARIES) \
$(GNUSTEP_HEADERS) \
$(GNUSTEP_HEADERS)$(HEADER_FILES_INSTALL_DIR) \
$(ADDITIONAL_INSTALL_DIRS)
internal-install-headers::
@ -83,6 +84,22 @@ internal-install-lib::
internal-install-import-lib::
internal-uninstall:: internal-uninstall-headers internal-uninstall-lib
internal-uninstall-headers::
for file in $(HEADER_FILES); do \
rm -f $(GNUSTEP_HEADERS)$(HEADER_FILES_INSTALL_DIR)/$$file ; \
done
internal-uninstall-libs:: internal-uninstall-lib \
internal-uninstall-import-lib
internal-uninstall-lib::
rm -f $(GNUSTEP_LIBRARIES)/$(VERSION_LIBRARY_FILE)
rm -f $(GNUSTEP_LIBRARIES)/$(LIBRARY_FILE)
internal-uninstall-import-lib::
#
# Cleaning targets
#
@ -96,9 +113,7 @@ internal-clean::
rm -f $(GNUSTEP_OBJ_DIR)/$(LIBRARY_FILE)
rm -f $(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE)
rm -f $(GNUSTEP_OBJ_DIR)/$(LIBRARY_FILE)
internal-distclean:: clean
rm -rf objs
rm -rf $(GNUSTEP_OBJ_PREFIX)
#
# Testing targets

5
rules.make
View file

@ -35,7 +35,8 @@ ALL_LDFLAGS = $(INTERNAL_LDFLAGS) $(ADDITIONAL_LDFLAGS) \
$(FND_LDFLAGS) $(GUI_LDFLAGS) $(BACKEND_LDFLAGS) \
$(SYSTEM_LDFLAGS)
ALL_LIB_DIRS = $(ADDITIONAL_LIB_DIRS) -L$(GNUSTEP_LIBRARIES) $(SYSTEM_LIB_DIR)
ALL_LIB_DIRS = $(ADDITIONAL_LIB_DIRS) -L$(GNUSTEP_LIBRARIES) \
-L$(GNUSTEP_TARGET_LIBRARIES) $(SYSTEM_LIB_DIR)
ALL_TOOL_LIBS = $(ADDITIONAL_TOOL_LIBS) $(FND_LIBS) $(OBJC_LIBS) \
$(TARGET_SYSTEM_LIBS)
@ -148,7 +149,7 @@ after-clean::
before-distclean::
internal-distclean::
internal-distclean:: clean
after-distclean::

5
tool.make
View file

@ -58,7 +58,4 @@ build-tool:: $(GNUSTEP_OBJ_DIR)/stamp-tool-$(TOOL_NAME)
#
internal-clean::
rm -f $(TOOL_NAME)
@rm -f $(TOOL_STAMPS)
internal-distclean:: clean
rm -rf objs
rm -rf $(GNUSTEP_OBJ_PREFIX)