Bundle files copied to better place. HP-UX commands.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@2779 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 1998-03-25 19:05:30 +00:00
parent 55cd41a8f5
commit 3f93e4e5bb
3 changed files with 39 additions and 2 deletions

View file

@ -1,3 +1,12 @@
Tue Mar 24 15:54:55 1998 Adam Fedor <fedor@ultra.doc.com>
* bundle.make (BUNDLE_RESOURCE_DIRS): Make all dirs a subdirectory
of Resources.
(bundle-resource-files): Include full RESOURCE_FILES path in cp
to-file.
* target.make: Add specifications for HP-UX.
Sat Feb 14 16:32:14 1998 Scott Christley <scottc@net-community.com>
* tool.make (TOOL_INSTALLATION_DIR): Move definition outside

View file

@ -78,7 +78,7 @@ after-$(TARGET)-all::
BUNDLE_DIR_NAME := $(INTERNAL_bundle_NAME:=$(BUNDLE_EXTENSION))
BUNDLE_FILE := \
$(BUNDLE_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)/$(BUNDLE_NAME)
BUNDLE_RESOURCE_DIRS = $(foreach d, $(RESOURCE_DIRS), $(BUNDLE_DIR_NAME)/$(d))
BUNDLE_RESOURCE_DIRS = $(foreach d, $(RESOURCE_DIRS), $(BUNDLE_DIR_NAME)/Resources/$(d))
build-bundle-dir::
@$(GNUSTEP_MAKEFILES)/mkinstalldirs \
@ -97,7 +97,7 @@ $(BUNDLE_FILE) : $(C_OBJ_FILES) $(OBJC_OBJ_FILES)
bundle-resource-files:: $(BUNDLE_DIR_NAME)/Resources/Info-gnustep.plist
@(if [ "$(RESOURCE_FILES)" != "" ]; then \
echo "Copying resources into the bundle wrapper..."; \
cp -r $(RESOURCE_FILES) $(BUNDLE_DIR_NAME)/Resources; \
cp -r $(RESOURCE_FILES) $(BUNDLE_DIR_NAME)/Resources/$(RESOURCE_FILES); \
fi)

View file

@ -44,6 +44,9 @@ endif
ifeq ($(findstring irix, $(GNUSTEP_TARGET_OS)), irix)
TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) -lm
endif
ifeq ($(findstring hpux, $(GNUSTEP_TARGET_OS)), hpux)
TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) -lm
endif
#
# Specific settings for building shared libraries, static libraries,
@ -264,3 +267,28 @@ endif
# end Solaris
#
####################################################
####################################################
#
# HP-UX
#
ifeq ($(findstring hpux, $(GNUSTEP_TARGET_OS)), hpux)
HAVE_SHARED_LIBS = yes
SHARED_LIB_LINK_CMD = \
(cd $(GNUSTEP_OBJ_DIR); $(CC) -v $(SHARED_CFLAGS) -shared -o $(VERSION_LIBRARY_FILE) *o ;\
rm -f $(LIBRARY_FILE); \
$(LN_S) $(VERSION_LIBRARY_FILE) $(LIBRARY_FILE))
SHARED_CFLAGS += -fPIC
SHARED_LIBEXT = .sl
HAVE_BUNDLES = yes
BUNDLE_LD = gcc
BUNDLE_CFLAGS += -fPIC
BUNDLE_LDFLAGS += -nodefaultlibs -Xlinker -r
endif
# end HP-UX
#
####################################################