mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 14:20:50 +00:00
* configure.in: added --with-libxml-include, --with-libxml-library
and --with-libiconv-library. Added -I/usr/local/include and -L/usr/local/lib for FreeBSD. * framework.make: new file. * common.make: added common frameworks defines (library, header paths). * bundle.make: added ALL_FRAMEWORKS_DIRS * rules.make: added frameworks headers flags. Prebuild framework header dir. Set framework name/dir/version. * subproject.make: build framework headers and resource files. * target.make: added SHARED_FRAMEWORK_LINK_CMD * tool.make: added ALL_FRAMEWORKS_DIRS * ld_lib_path.csh: added paths for frameworks. * ld_lib_path.sh (lib_paths): added paths for frameworks. * GNUmakefile.in (MAKE_FILES): added framework.make * Headers/gnustep/base/NSBundle.h: added ivar. * Source/NSBundle.m ([NSBundle +_addFrameworkFromClass:]): new private method to parse NSFramework_* classes. (_bundle_load_callback): added framework support. Wrap classes in a NSValue to avoid implicit initialization. ([NSBundle +allBundles]): added framework support. ([NSBundle +allFrameworks]): implemented. ([NSBundle +bundleForClass:]): get classes from NSValue object. ([NSBundle -classNamed:]): likewise. * Headers/gnustep/base/objc-load.h (LINKER_GETSYMBOL): new define. * Source/objc-load.m (objc_get_symbol_path): get lib path of a Class or Category. * Source/simple-load.h (__objc_dynamic_get_symbol_path): indentifies lib path of a symbol. * Source/dld-load.h (__objc_dynamic_get_symbol_path): not supported. * Source/hpux-load.h (__objc_dynamic_get_symbol_path): not implemented. * Source/mframe/mframe.foot (mframe_get_arg): typ declaration fix. (mframe_set_arg): idem * Headers/gnustep/base/config.h.in: added HAVE_DLADDR * aclocal.m4 (OBJC_SYS_DYNAMIC_LINKER): test for dladdr() * configure.in: added --with-libxml-include and --with-libxml-library, added -I/usr/local/include and -L/usr/local/lib for FreeBSD. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@7918 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
4889aa7667
commit
ecd526fbcc
13 changed files with 976 additions and 170 deletions
18
ChangeLog
18
ChangeLog
|
@ -1,3 +1,21 @@
|
|||
2000-10-28 Mirko Viviani <mirko.viviani@rccr.cremona.it>
|
||||
|
||||
* configure.in: added --with-libxml-include, --with-libxml-library
|
||||
and --with-libiconv-library.
|
||||
Added -I/usr/local/include and -L/usr/local/lib for FreeBSD.
|
||||
|
||||
* framework.make: new file.
|
||||
* common.make: added common frameworks defines (library, header paths).
|
||||
* bundle.make: added ALL_FRAMEWORKS_DIRS
|
||||
* rules.make: added frameworks headers flags. Prebuild framework
|
||||
header dir. Set framework name/dir/version.
|
||||
* subproject.make: build framework headers and resource files.
|
||||
* target.make: added SHARED_FRAMEWORK_LINK_CMD
|
||||
* tool.make: added ALL_FRAMEWORKS_DIRS
|
||||
* ld_lib_path.csh: added paths for frameworks.
|
||||
* ld_lib_path.sh (lib_paths): added paths for frameworks.
|
||||
* GNUmakefile.in (MAKE_FILES): added framework.make
|
||||
|
||||
Thu Oct 19 15:46:02 2000 Nicola Pero <n.pero@mi.flashnet.it>
|
||||
|
||||
* opentool.in: Fix for passing arguments protected by quote.
|
||||
|
|
|
@ -61,7 +61,7 @@ MAKE_FILES = aggregate.make application.make bundle.make service.make \
|
|||
target.make tool.make ctool.make test-library.make names.make \
|
||||
objc.make test-application.make test-tool.make subproject.make \
|
||||
palette.make gswapp.make gswbundle.make woapp.make wobundle.make \
|
||||
documentation.make MediaBook.func executable.template
|
||||
documentation.make MediaBook.func executable.template framework.make
|
||||
|
||||
all: generated-files which_lib$(EXEEXT)
|
||||
|
||||
|
|
|
@ -136,7 +136,7 @@ $(BUNDLE_FILE) : $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) $(OBJ_
|
|||
$(DLLWRAP) --driver-name $(CC) \
|
||||
-o $(LDOUT)$(BUNDLE_FILE) \
|
||||
$(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) $(OBJ_FILES) \
|
||||
$(ALL_LIB_DIRS) $(ALL_BUNDLE_LIBS)
|
||||
$(ALL_FRAMEWORKS_DIRS) $(ALL_LIB_DIRS) $(ALL_BUNDLE_LIBS)
|
||||
|
||||
else # WITH_DLL
|
||||
|
||||
|
@ -144,7 +144,7 @@ $(BUNDLE_FILE) : $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) $(OBJ_
|
|||
$(BUNDLE_LD) $(BUNDLE_LDFLAGS) $(ALL_LDFLAGS) \
|
||||
-o $(LDOUT)$(BUNDLE_FILE) \
|
||||
$(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) \
|
||||
$(ALL_LIB_DIRS) $(ALL_BUNDLE_LIBS)
|
||||
$(ALL_FRAMEWORK_DIRS) $(ALL_LIB_DIRS) $(ALL_BUNDLE_LIBS)
|
||||
|
||||
endif # WITH_DLL
|
||||
|
||||
|
|
46
common.make
46
common.make
|
@ -93,6 +93,11 @@ GNUSTEP_SERVICES = $(GNUSTEP_INSTALLATION_DIR)/Library/Services
|
|||
GNUSTEP_WOAPPS = $(GNUSTEP_INSTALLATION_DIR)/WOApps
|
||||
GNUSTEP_HEADERS = $(GNUSTEP_INSTALLATION_DIR)/Headers
|
||||
GNUSTEP_BUNDLES = $(GNUSTEP_INSTALLATION_DIR)/Library/Bundles
|
||||
GNUSTEP_FRAMEWORKS = $(GNUSTEP_INSTALLATION_DIR)/Library/Frameworks
|
||||
GNUSTEP_FRAMEWORKS_HEADERS = $(GNUSTEP_INSTALLATION_DIR)/Library/Headers
|
||||
GNUSTEP_FRAMEWORKS_LIBRARIES_ROOT = $(GNUSTEP_INSTALLATION_DIR)/Library/Libraries
|
||||
GNUSTEP_FRAMEWORKS_TARGET_LIBRARIES = $(GNUSTEP_FRAMEWORKS_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
|
||||
GNUSTEP_FRAMEWORKS_LIBRARIES = $(GNUSTEP_FRAMEWORKS_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
|
||||
GNUSTEP_PALETTES = $(GNUSTEP_INSTALLATION_DIR)/Developer/Palettes
|
||||
GNUSTEP_LIBRARIES_ROOT = $(GNUSTEP_INSTALLATION_DIR)/Libraries
|
||||
GNUSTEP_TARGET_LIBRARIES = $(GNUSTEP_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
|
||||
|
@ -109,13 +114,20 @@ MAKEFILE_NAME = GNUmakefile
|
|||
endif
|
||||
|
||||
# In case we need to explicitly reference
|
||||
# the system, local, and user library directories
|
||||
# the system, local, and user library and framework's library directories
|
||||
GNUSTEP_SYSTEM_LIBRARIES_ROOT = $(GNUSTEP_SYSTEM_ROOT)/Libraries
|
||||
GNUSTEP_SYSTEM_TARGET_LIBRARIES = \
|
||||
$(GNUSTEP_SYSTEM_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
|
||||
GNUSTEP_SYSTEM_LIBRARIES = $(GNUSTEP_SYSTEM_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
|
||||
GNUSTEP_SYSTEM_HEADERS = $(GNUSTEP_SYSTEM_ROOT)/Headers
|
||||
|
||||
GNUSTEP_SYSTEM_FRAMEWORKS_LIBRARIES_ROOT = $(GNUSTEP_SYSTEM_ROOT)/Library/Libraries
|
||||
GNUSTEP_SYSTEM_FRAMEWORKS_TARGET_LIBRARIES = \
|
||||
$(GNUSTEP_SYSTEM_FRAMEWORKS_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
|
||||
GNUSTEP_SYSTEM_FRAMEWORKS_LIBRARIES = $(GNUSTEP_SYSTEM_FRAMEWORKS_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
|
||||
# FIXME: parse -framework keyword
|
||||
GNUSTEP_SYSTEM_FRAMEWORKS_HEADERS = $(GNUSTEP_SYSTEM_ROOT)/Library/Headers
|
||||
|
||||
ifneq ($(GNUSTEP_LOCAL_ROOT),)
|
||||
GNUSTEP_LOCAL_LIBRARIES_ROOT = $(GNUSTEP_LOCAL_ROOT)/Libraries
|
||||
GNUSTEP_LOCAL_TARGET_LIBRARIES = \
|
||||
|
@ -125,6 +137,16 @@ GNUSTEP_LOCAL_LIBRARIES = $(GNUSTEP_LOCAL_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
|
|||
GNUSTEP_LOCAL_LIBRARIES_FLAG = -L$(GNUSTEP_LOCAL_LIBRARIES)
|
||||
GNUSTEP_LOCAL_HEADERS = $(GNUSTEP_LOCAL_ROOT)/Headers
|
||||
GNUSTEP_LOCAL_HEADERS_FLAG = -I$(GNUSTEP_LOCAL_HEADERS)
|
||||
|
||||
GNUSTEP_LOCAL_FRAMEWORKS_LIBRARIES_ROOT = $(GNUSTEP_LOCAL_ROOT)/Library/Libraries
|
||||
GNUSTEP_LOCAL_FRAMEWORKS_TARGET_LIBRARIES = \
|
||||
$(GNUSTEP_LOCAL_FRAMEWORKS_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
|
||||
GNUSTEP_LOCAL_FRAMEWORKS_TARGET_LIBRARIES_FLAG = -L$(GNUSTEP_LOCAL_FRAMEWORKS_TARGET_LIBRARIES)
|
||||
GNUSTEP_LOCAL_FRAMEWORKS_LIBRARIES = $(GNUSTEP_LOCAL_FRAMEWORKS_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
|
||||
GNUSTEP_LOCAL_FRAMEWORKS_LIBRARIES_FLAG = -L$(GNUSTEP_LOCAL_FRAMEWORKS_LIBRARIES)
|
||||
# FIXME: parse -framework keyword
|
||||
GNUSTEP_LOCAL_FRAMEWORKS_HEADERS = $(GNUSTEP_LOCAL_ROOT)/Library/Headers
|
||||
GNUSTEP_LOCAL_FRAMEWORKS_HEADERS_FLAG = -I$(GNUSTEP_LOCAL_FRAMEWORKS_HEADERS)
|
||||
endif
|
||||
|
||||
ifneq ($(GNUSTEP_USER_ROOT),)
|
||||
|
@ -136,6 +158,16 @@ GNUSTEP_USER_LIBRARIES = $(GNUSTEP_USER_TARGET_LIBRARIES)/$(LIBRARY_COMBO
|
|||
GNUSTEP_USER_LIBRARIES_FLAG = -L$(GNUSTEP_USER_LIBRARIES)
|
||||
GNUSTEP_USER_HEADERS = $(GNUSTEP_USER_ROOT)/Headers
|
||||
GNUSTEP_USER_HEADERS_FLAG = -I$(GNUSTEP_USER_HEADERS)
|
||||
|
||||
GNUSTEP_USER_FRAMEWORKS_LIBRARIES_ROOT = $(GNUSTEP_USER_ROOT)/Library/Libraries
|
||||
GNUSTEP_USER_FRAMEWORKS_TARGET_LIBRARIES = \
|
||||
$(GNUSTEP_USER_FRAMEWORKS_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
|
||||
GNUSTEP_USER_FRAMEWORKS_TARGET_LIBRARIES_FLAG = -L$(GNUSTEP_USER_FRAMEWORKS_TARGET_LIBRARIES)
|
||||
GNUSTEP_USER_FRAMEWORKS_LIBRARIES = $(GNUSTEP_USER_FRAMEWORKS_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
|
||||
GNUSTEP_USER_LIBRARIES_FLAG = -L$(GNUSTEP_USER_FRAMEWORKS_LIBRARIES)
|
||||
# FIXME: parse -framework keyword
|
||||
GNUSTEP_USER_FRAMEWORKS_HEADERS = $(GNUSTEP_USER_ROOT)/Library/Headers
|
||||
GNUSTEP_USER_FRAMEWORKS_HEADERS_FLAG = -I$(GNUSTEP_USER_FRAMEWORKS_HEADERS)
|
||||
endif
|
||||
|
||||
ifneq ($(GNUSTEP_NETWORK_ROOT),)
|
||||
|
@ -147,6 +179,16 @@ GNUSTEP_NETWORK_LIBRARIES = $(GNUSTEP_NETWORK_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
|
|||
GNUSTEP_NETWORK_LIBRARIES_FLAG = -L$(GNUSTEP_NETWORK_LIBRARIES)
|
||||
GNUSTEP_NETWORK_HEADERS = $(GNUSTEP_NETWORK_ROOT)/Headers
|
||||
GNUSTEP_NETWORK_HEADERS_FLAG = -I$(GNUSTEP_NETWORK_HEADERS)
|
||||
|
||||
GNUSTEP_NETWORK_FRAMEWORKS_LIBRARIES_ROOT = $(GNUSTEP_NETWORK_ROOT)/Library/Libraries
|
||||
GNUSTEP_NETWORK_FRAMEWORKS_TARGET_LIBRARIES = \
|
||||
$(GNUSTEP_NETWORK_FRAMEWORKS_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
|
||||
GNUSTEP_NETWORK_FRAMEWORKS_TARGET_LIBRARIES_FLAG = -L$(GNUSTEP_NETWORK_FRAMEWORKS_TARGET_LIBRARIES)
|
||||
GNUSTEP_NETWORK_FRAMEWORKS_LIBRARIES = $(GNUSTEP_NETWORK_FRAMEWORKS_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
|
||||
GNUSTEP_NETWORK_FRAMEWORKS_LIBRARIES_FLAG = -L$(GNUSTEP_NETWORK_FRAMEWORKS_LIBRARIES)
|
||||
# FIXME: parse -framework keyword
|
||||
GNUSTEP_NETWORK_FRAMEWORKS_HEADERS = $(GNUSTEP_NETWORK_ROOT)/Library/Headers
|
||||
GNUSTEP_NETWORK_FRAMEWORKS_HEADERS_FLAG = -I$(GNUSTEP_NETWORK_FRAMEWORKS_HEADERS)
|
||||
endif
|
||||
#
|
||||
# Target specific header include directories
|
||||
|
@ -253,12 +295,14 @@ endif
|
|||
|
||||
ifeq ($(shared), yes)
|
||||
LIB_LINK_CMD = $(SHARED_LIB_LINK_CMD)
|
||||
FRAMEWORK_LINK_CMD = $(SHARED_FRAMEWORK_LINK_CMD)
|
||||
OBJ_DIR_PREFIX += shared_
|
||||
INTERNAL_OBJCFLAGS += $(SHARED_CFLAGS)
|
||||
INTERNAL_CFLAGS += $(SHARED_CFLAGS)
|
||||
AFTER_INSTALL_LIBRARY_CMD = $(AFTER_INSTALL_SHARED_LIB_COMMAND)
|
||||
else
|
||||
LIB_LINK_CMD = $(STATIC_LIB_LINK_CMD)
|
||||
FRAMEWORK_LINK_CMD = $(STATIC_FRAMEWORK_LINK_CMD)
|
||||
OBJ_DIR_PREFIX += static_
|
||||
AFTER_INSTALL_LIBRARY_CMD = $(AFTER_INSTALL_STATIC_LIB_COMMAND)
|
||||
LIBRARY_NAME_SUFFIX := s$(LIBRARY_NAME_SUFFIX)
|
||||
|
|
41
configure.in
41
configure.in
|
@ -92,6 +92,14 @@ if test "$ac_cv_library_combo" = ""; then
|
|||
fi
|
||||
AC_SUBST(ac_cv_library_combo)
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# specific target_os options
|
||||
#--------------------------------------------------------------------
|
||||
case "$target_os" in
|
||||
freebsd*) CPPFLAGS="$CPPFLAGS -I/usr/local/include"
|
||||
LIBS="$LIBS -L/usr/local/lib";;
|
||||
esac
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Determine the host, build, and target systems
|
||||
#--------------------------------------------------------------------
|
||||
|
@ -473,6 +481,24 @@ AC_SUBST(ac_cv_objc_threaded)
|
|||
# Check recent libxml for Properytlists, GSXML, GSDoc etc.
|
||||
#--------------------------------------------------------------------
|
||||
echo "Checking for libxml"
|
||||
AC_ARG_WITH(libxml-include,
|
||||
[ --with-libxml-include=PATH include path for libxml headers],
|
||||
libxml_incdir="$withval", libxml_incdir="no")
|
||||
|
||||
AC_ARG_WITH(libxml-library,
|
||||
[ --with-libxml-library=PATH library path for libxml libraries],
|
||||
libxml_libdir="$withval", libxml_libdir="no")
|
||||
|
||||
cppflags_temp=$CFLAGS
|
||||
libs_temp=$LIBS
|
||||
|
||||
if test "$libxml_incdir" != "no"; then
|
||||
CPPFLAGS="$CPPFLAGS -I$libxml_incdir"
|
||||
fi
|
||||
if test "$libxml_libdir" != "no"; then
|
||||
LIBS="$LIBS -L$libxml_libdir"
|
||||
fi
|
||||
|
||||
AC_CHECK_HEADERS(libxml/xmlversion.h)
|
||||
if test $ac_cv_header_libxml_xmlversion_h = no; then
|
||||
echo "Could not find libxml headers"
|
||||
|
@ -495,6 +521,10 @@ else
|
|||
fi
|
||||
fi
|
||||
|
||||
if test "$HAVE_LIBXML" = "0"; then
|
||||
CPPFLAGS="$cppflags_temp";
|
||||
LIBS="$libs_temp";
|
||||
fi
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Check for iconv support (for Unicode conversion).
|
||||
|
@ -503,11 +533,22 @@ fi
|
|||
AC_CHECK_FUNCS(iconv)
|
||||
if test $ac_cv_func_iconv = no; then
|
||||
# Check if we have a libiconv library
|
||||
AC_ARG_WITH(libiconv-library,
|
||||
[ --with-libiconv-library=PATH library path for libiconv libraries],
|
||||
libiconv_libdir="$withval", libiconv_libdir="no")
|
||||
libs_temp=$LIBS
|
||||
|
||||
if test "$libiconv_libdir" != "no"; then
|
||||
LIBS="$LIBS -L$libiconv_libdir"
|
||||
fi
|
||||
|
||||
AC_CHECK_LIB(iconv, main)
|
||||
if test x"$av_cv_lib_iconv_main" = xyes; then
|
||||
LIBS="$LIBS -liconv"
|
||||
AC_SUBST(LIBS)
|
||||
SYSTEM_DEFS="-DHAVE_ICONV $SYSTEM_DEFS"
|
||||
else
|
||||
LIBS="$libs_temp";
|
||||
fi
|
||||
else
|
||||
SYSTEM_DEFS="-DHAVE_ICONV $SYSTEM_DEFS"
|
||||
|
|
385
framework.make
Normal file
385
framework.make
Normal file
|
@ -0,0 +1,385 @@
|
|||
#
|
||||
# framework.make
|
||||
#
|
||||
# Makefile rules to build GNUstep-based frameworks.
|
||||
#
|
||||
# Copyright (C) 2000 Free Software Foundation, Inc.
|
||||
#
|
||||
# Author: Mirko Viviani <mirko.viviani@rccr.cremona.it>
|
||||
#
|
||||
# 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,
|
||||
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
# prevent multiple inclusions
|
||||
ifeq ($(FRAMEWORK_MAKE_LOADED),)
|
||||
FRAMEWORK_MAKE_LOADED=yes
|
||||
|
||||
#
|
||||
# Include in the common makefile rules
|
||||
#
|
||||
include $(GNUSTEP_MAKEFILES)/rules.make
|
||||
|
||||
# The name of the bundle is in the FRAMEWORK_NAME variable.
|
||||
# The list of framework resource file are in xxx_RESOURCE_FILES
|
||||
# The list of localized framework resource files is in xxx_LOCALIZED_RESOURCE_FILES
|
||||
# The list of languages the framework supports is in xxx_LANGUAGES
|
||||
# The list of framework resource directories are in xxx_RESOURCE_DIRS
|
||||
# The list of framework subprojects directories are in xxx_SUBPROJECTS
|
||||
# The name of the principal class is xxx_PRINCIPAL_CLASS
|
||||
# The header files are in xxx_HEADER_FILES
|
||||
# where xxx is the framework name
|
||||
#
|
||||
|
||||
DERIVED_SOURCES = derived_src
|
||||
ADDITIONAL_INCLUDE_DIRS += -I$(DERIVED_SOURCES)
|
||||
|
||||
|
||||
ifeq ($(INTERNAL_framework_NAME),)
|
||||
# This part is included the first time make is invoked.
|
||||
|
||||
internal-all:: $(FRAMEWORK_NAME:=.all.framework.variables)
|
||||
|
||||
internal-install:: all $(FRAMEWORK_NAME:=.install.framework.variables)
|
||||
|
||||
internal-uninstall:: $(FRAMEWORK_NAME:=.uninstall.framework.variables)
|
||||
|
||||
internal-clean:: $(FRAMEWORK_NAME:=.clean.framework.variables)
|
||||
|
||||
internal-distclean:: $(FRAMEWORK_NAME:=.distclean.framework.variables)
|
||||
|
||||
$(FRAMEWORK_NAME):
|
||||
@$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \
|
||||
$@.all.framework.variables
|
||||
|
||||
else
|
||||
# This part gets included the second time make is invoked.
|
||||
|
||||
ALL_FRAMEWORK_LIBS = $(FRAMEWORK_LIBS)
|
||||
|
||||
ALL_FRAMEWORK_LIBS := \
|
||||
$(shell $(WHICH_LIB_SCRIPT) $(LIB_DIRS_NO_SYSTEM) $(ALL_FRAMEWORK_LIBS) \
|
||||
debug=$(debug) profile=$(profile) shared=$(shared) libext=$(LIBEXT) \
|
||||
shared_libext=$(SHARED_LIBEXT))
|
||||
|
||||
|
||||
DUMMY_FRAMEWORK = NSFramework_$(INTERNAL_framework_NAME)
|
||||
DUMMY_FRAMEWORK_FILE = $(DERIVED_SOURCES)/$(DUMMY_FRAMEWORK).m
|
||||
DUMMY_FRAMEWORK_OBJ_FILE = $(addprefix $(GNUSTEP_OBJ_DIR)/,$(DUMMY_FRAMEWORK).o)
|
||||
|
||||
FRAMEWORK_HEADER_FILES := $(patsubst %.h,$(FRAMEWORK_VERSION_DIR_NAME)/Headers/%.h,$(HEADER_FILES))
|
||||
|
||||
|
||||
ifneq ($(BUILD_DLL),yes)
|
||||
|
||||
FRAMEWORK_CURRENT_DIR_NAME := $(FRAMEWORK_DIR_NAME)/Versions/Current
|
||||
FRAMEWORK_LIBRARY_DIR_NAME := $(FRAMEWORK_VERSION_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)
|
||||
FRAMEWORK_CURRENT_LIBRARY_DIR_NAME := $(FRAMEWORK_CURRENT_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)
|
||||
FRAMEWORK_CURRENT_DIR_NAME := $(FRAMEWORK_VERSION_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)
|
||||
FRAMEWORK_RESOURCE_DIRS = $(foreach d, $(RESOURCE_DIRS), $(FRAMEWORK_DIR_NAME)/Resources/$(d))
|
||||
|
||||
FRAMEWORK_LIBRARY_FILE = lib$(INTERNAL_framework_NAME)$(SHARED_LIBEXT)
|
||||
FRAMEWORK_LIBRARY_FILE_EXT = $(SHARED_LIBEXT)
|
||||
VERSION_FRAMEWORK_LIBRARY_FILE = $(FRAMEWORK_LIBRARY_FILE).$(VERSION)
|
||||
SOVERSION = `echo $(VERSION)|awk -F. '{print $$1}'`
|
||||
SONAME_FRAMEWORK_FILE = $(FRAMEWORK_LIBRARY_FILE).$(SOVERSION)
|
||||
|
||||
FRAMEWORK_FILE := $(FRAMEWORK_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE)
|
||||
|
||||
else # BUILD_DLL
|
||||
|
||||
FRAMEWORK_FILE = $(INTERNAL_framework_NAME)$(FRAMEWORK_NAME_SUFFIX)$(DLL_LIBEXT)
|
||||
FRAMEWORK_FILE_EXT = $(DLL_LIBEXT)
|
||||
DLL_NAME = $(shell echo $(LIBRARY_FILE)|cut -b 4-)
|
||||
DLL_EXP_LIB = $(INTERNAL_framework_NAME)$(FRAMEWORK_NAME_SUFFIX)$(SHARED_LIBEXT)
|
||||
DLL_EXP_DEF = $(INTERNAL_framework_NAME)$(FRAMEWORK_NAME_SUFFIX).def
|
||||
|
||||
ifeq ($(DLL_INSTALLATION_DIR),)
|
||||
DLL_INSTALLATION_DIR = \
|
||||
$(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)
|
||||
endif
|
||||
|
||||
endif # BUILD_DLL
|
||||
|
||||
ifeq ($(WITH_DLL),yes)
|
||||
TTMP_LIBS := $(ALL_FRAMEWORK_LIBS)
|
||||
TTMP_LIBS := $(filter -l%, $(TTMP_LIBS))
|
||||
# filter all non-static libs (static libs are those ending in _ds, _s, _ps..)
|
||||
TTMP_LIBS := $(filter-out -l%_ds, $(TTMP_LIBS))
|
||||
TTMP_LIBS := $(filter-out -l%_s, $(TTMP_LIBS))
|
||||
TTMP_LIBS := $(filter-out -l%_dps,$(TTMP_LIBS))
|
||||
TTMP_LIBS := $(filter-out -l%_ps, $(TTMP_LIBS))
|
||||
# strip away -l, _p and _d ..
|
||||
TTMP_LIBS := $(TTMP_LIBS:-l%=%)
|
||||
TTMP_LIBS := $(TTMP_LIBS:%_d=%)
|
||||
TTMP_LIBS := $(TTMP_LIBS:%_p=%)
|
||||
TTMP_LIBS := $(TTMP_LIBS:%_dp=%)
|
||||
TTMP_LIBS := $(shell echo $(TTMP_LIBS)|tr '-' '_')
|
||||
TTMP_LIBS := $(TTMP_LIBS:%=-Dlib%_ISDLL=1)
|
||||
ALL_CPPFLAGS += $(TTMP_LIBS)
|
||||
FRAMEWORK_OBJ_EXT = $(DLL_LIBEXT)
|
||||
endif # WITH_DLL
|
||||
|
||||
internal-framework-all:: before-$(TARGET)-all $(GNUSTEP_OBJ_DIR) \
|
||||
build-framework-dir build-framework \
|
||||
after-$(TARGET)-all
|
||||
|
||||
before-$(TARGET)-all:: $(FRAMEWORK_HEADER_FILES)
|
||||
|
||||
after-$(TARGET)-all::
|
||||
|
||||
FRAMEWORK_RESOURCE_DIRS = $(foreach d, $(RESOURCE_DIRS), $(FRAMEWORK_VERSION_DIR_NAME)/Resources/$(d))
|
||||
ifeq ($(strip $(RESOURCE_FILES)),)
|
||||
override RESOURCE_FILES=""
|
||||
endif
|
||||
ifeq ($(strip $(LOCALIZED_RESOURCE_FILES)),)
|
||||
override LOCALIZED_RESOURCE_FILES=""
|
||||
endif
|
||||
ifeq ($(strip $(LANGUAGES)),)
|
||||
override LANGUAGES="English"
|
||||
endif
|
||||
ifeq ($(FRAMEWORK_INSTALL_DIR),)
|
||||
FRAMEWORK_INSTALL_DIR := $(GNUSTEP_FRAMEWORKS)
|
||||
endif
|
||||
|
||||
|
||||
build-framework-dir::
|
||||
@$(MKDIRS) \
|
||||
$(FRAMEWORK_LIBRARY_DIR_NAME) \
|
||||
$(FRAMEWORK_VERSION_DIR_NAME)/Resources \
|
||||
$(FRAMEWORK_RESOURCE_DIRS)
|
||||
@(if [ "$(DEPLOY_WITH_CURRENT_VERSION)" = "yes" ]; then \
|
||||
rm -f $(FRAMEWORK_DIR_NAME)/Versions/Current; \
|
||||
fi;)
|
||||
@(cd $(FRAMEWORK_DIR_NAME)/Versions; \
|
||||
if test ! -L "Current"; then \
|
||||
$(LN_S) $(CURRENT_VERSION_NAME) Current; \
|
||||
fi;)
|
||||
@(cd $(FRAMEWORK_DIR_NAME); \
|
||||
if test ! -L "Resources"; then \
|
||||
$(LN_S) Versions/Current/Resources .; \
|
||||
fi;)
|
||||
|
||||
build-framework-headers:: build-framework-dir $(DERIVED_SOURCES) $(FRAMEWORK_HEADER_FILES)
|
||||
|
||||
$(FRAMEWORK_HEADER_FILES):: $(HEADER_FILES)
|
||||
if [ "$(HEADER_FILES)" != "" ]; then \
|
||||
$(MKDIRS) $(FRAMEWORK_VERSION_DIR_NAME)/Headers; \
|
||||
if test ! -L "$(DERIVED_SOURCES)/$(INTERNAL_framework_NAME)"; then \
|
||||
$(LN_S) ../$(FRAMEWORK_DIR_NAME)/Headers \
|
||||
$(DERIVED_SOURCES)/$(INTERNAL_framework_NAME); \
|
||||
fi; \
|
||||
if test ! -L "$(FRAMEWORK_DIR_NAME)/Headers"; then \
|
||||
$(LN_S) Versions/Current/Headers $(FRAMEWORK_DIR_NAME); \
|
||||
fi; \
|
||||
for file in $(HEADER_FILES) __done; do \
|
||||
if [ $$file != __done ]; then \
|
||||
$(INSTALL_DATA) ./$$file \
|
||||
$(FRAMEWORK_VERSION_DIR_NAME)/Headers/$$file ; \
|
||||
fi; \
|
||||
done; \
|
||||
fi;
|
||||
|
||||
$(DERIVED_SOURCES) :
|
||||
$(MKDIRS) $@
|
||||
|
||||
$(DUMMY_FRAMEWORK_FILE): $(DERIVED_SOURCES) $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) $(OBJ_FILES) GNUmakefile
|
||||
@(if [ "$(OBJC_OBJ_FILES)" != "" ]; then objcfiles="$(OBJC_OBJ_FILES)"; \
|
||||
fi; \
|
||||
if [ "$(SUBPROJECT_OBJ_FILES)" != "" ]; then objcfiles="$$objcfiles $(SUBPROJECT_OBJ_FILES)"; \
|
||||
fi; \
|
||||
if [ "$$objcfiles" = "" ]; then objcfiles="__dummy__"; \
|
||||
fi;\
|
||||
classes=""; \
|
||||
if [ "$$objcfiles" != "__dummy__" ]; then \
|
||||
for f in $$objcfiles; do \
|
||||
sym=`nm -Pg $$f | awk '/__objc_class_name_/ {if($$2 == "R") print $$1}' | sed 's/__objc_class_name_//'`; \
|
||||
classes="$$classes $$sym"; \
|
||||
done; \
|
||||
fi; \
|
||||
first="yes"; \
|
||||
if [ "$$classes" = "" ]; then classes="__dummy__"; \
|
||||
fi;\
|
||||
if [ "$$classes" != "__dummy__" ]; then \
|
||||
for f in $$classes; do \
|
||||
if [ "$$first" = "yes" ]; then \
|
||||
classlist="@\"$$f\""; \
|
||||
first="no"; \
|
||||
else \
|
||||
classlist="$$classlist, @\"$$f\""; \
|
||||
fi; \
|
||||
done; \
|
||||
fi; \
|
||||
if [ "`echo $(FRAMEWORK_INSTALL_DIR) | sed 's/^$(subst /,\/,$(GNUSTEP_USER_ROOT))//'`" != "$(FRAMEWORK_INSTALL_DIR)" ]; then \
|
||||
fw_env="@\"GNUSTEP_USER_ROOT\""; \
|
||||
elif [ "`echo $(FRAMEWORK_INSTALL_DIR) | sed 's/^$(subst /,\/,$(GNUSTEP_LOCAL_ROOT))//'`" != "$(FRAMEWORK_INSTALL_DIR)" ]; then \
|
||||
fw_env="@\"GNUSTEP_LOCAL_ROOT\""; \
|
||||
elif [ "`echo $(FRAMEWORK_INSTALL_DIR) | sed 's/^$(subst /,\/,$(GNUSTEP_SYSTEM_ROOT))//'`" != "$(FRAMEWORK_INSTALL_DIR)" ]; then \
|
||||
fw_env="@\"GNUSTEP_SYSTEM_ROOT\""; \
|
||||
else \
|
||||
fw_env="nil"; \
|
||||
fi; \
|
||||
fw_path=`echo $(FRAMEWORK_INSTALL_DIR) | sed 's/^$(subst /,\/,$(GNUSTEP_FRAMEWORKS))//'`; \
|
||||
if [ "$$fw_path" = "$(FRAMEWORK_INSTALL_DIR)" ]; then \
|
||||
fw_path="nil"; \
|
||||
elif [ "$$fw_path" = "" ]; then \
|
||||
fw_path="nil"; \
|
||||
else \
|
||||
fw_path="@\"$$fw_path\""; \
|
||||
fi; \
|
||||
echo "Creating $(DUMMY_FRAMEWORK_FILE)"; \
|
||||
echo "#include <Foundation/NSString.h>" > $@; \
|
||||
echo "@interface $(DUMMY_FRAMEWORK)" >> $@; \
|
||||
echo "+ (NSString *)frameworkEnv;" >> $@; \
|
||||
echo "+ (NSString *)frameworkPath;" >> $@; \
|
||||
echo "+ (NSString *)frameworkVersion;" >> $@; \
|
||||
echo "+ (NSString **)frameworkClasses;" >> $@; \
|
||||
echo "@end" >> $@; \
|
||||
echo "@implementation $(DUMMY_FRAMEWORK)" >> $@; \
|
||||
echo "+ (NSString *)frameworkEnv { return $$fw_env; }" >> $@; \
|
||||
echo "+ (NSString *)frameworkPath { return $$fw_path; }" >> $@; \
|
||||
echo "+ (NSString *)frameworkVersion { return @\"$(CURRENT_VERSION_NAME)\"; }" >> $@; \
|
||||
echo "static NSString *allClasses[] = {$$classlist, NULL};" >> $@; \
|
||||
echo "+ (NSString **)frameworkClasses { return allClasses; }" >> $@; \
|
||||
echo "@end" >> $@;)
|
||||
|
||||
$(DUMMY_FRAMEWORK_OBJ_FILE): $(DUMMY_FRAMEWORK_FILE)
|
||||
$(CC) $< -c $(ALL_CPPFLAGS) $(ALL_OBJCFLAGS) -o $@
|
||||
|
||||
build-framework:: $(FRAMEWORK_FILE) framework-resource-files localized-framework-resource-files
|
||||
|
||||
ifeq ($(WITH_DLL),yes)
|
||||
|
||||
$(FRAMEWORK_FILE) : $(DUMMY_FRAMEWORK_OBJ_FILE) $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) $(OBJ_FILES)
|
||||
$(DLLWRAP) --driver-name $(CC) \
|
||||
-o $(LDOUT)$(FRAMEWORK_FILE) \
|
||||
$(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) $(OBJ_FILES) \
|
||||
$(ALL_LIB_DIRS) $(ALL_FRAMEWORK_LIBS)
|
||||
|
||||
else # WITH_DLL
|
||||
|
||||
$(FRAMEWORK_FILE) : $(DUMMY_FRAMEWORK_OBJ_FILE) $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) $(OBJ_FILES)
|
||||
$(FRAMEWORK_LINK_CMD)
|
||||
@(cd $(FRAMEWORK_LIBRARY_DIR_NAME); \
|
||||
rm -f $(INTERNAL_framework_NAME); \
|
||||
$(LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE) $(INTERNAL_framework_NAME))
|
||||
|
||||
endif # WITH_DLL
|
||||
|
||||
framework-resource-files:: $(FRAMEWORK_VERSION_DIR_NAME)/Resources/Info.plist $(FRAMEWORK_VERSION_DIR_NAME)/Resources/Info-gnustep.plist
|
||||
@(if [ "$(RESOURCE_FILES)" != "" ]; then \
|
||||
echo "Copying resources into the framework wrapper..."; \
|
||||
for f in "$(RESOURCE_FILES)"; do \
|
||||
cp -r $$f $(FRAMEWORK_VERSION_DIR_NAME)/Resources; \
|
||||
done; \
|
||||
fi;)
|
||||
|
||||
localized-framework-resource-files:: $(FRAMEWORK_VERSION_DIR_NAME)/Resources/Info-gnustep.plist
|
||||
@(if [ "$(LOCALIZED_RESOURCE_FILES)" != "" ]; then \
|
||||
echo "Copying localized resources into the framework wrapper..."; \
|
||||
for l in $(LANGUAGES); do \
|
||||
if [ ! -f $$l.lproj ]; then \
|
||||
$(MKDIRS) $(FRAMEWORK_VERSION_DIR_NAME)/Resources/$$l.lproj; \
|
||||
fi; \
|
||||
for f in $(LOCALIZED_RESOURCE_FILES); do \
|
||||
if [ -f $$l.lproj/$$f ]; then \
|
||||
cp -r $$l.lproj/$$f $(FRAMEWORK_VERSION_DIR_NAME)/Resources/$$l.lproj; \
|
||||
fi; \
|
||||
done; \
|
||||
done; \
|
||||
fi)
|
||||
|
||||
ifeq ($(PRINCIPAL_CLASS),)
|
||||
override PRINCIPAL_CLASS = $(INTERNAL_framework_NAME)
|
||||
endif
|
||||
|
||||
# MacOSX-S bundles
|
||||
$(FRAMEWORK_VERSION_DIR_NAME)/Resources/Info.plist: $(FRAMEWORK_VERSION_DIR_NAME)/Resources
|
||||
@(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
|
||||
echo " NSExecutable = \"$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)/$(FRAMEWORK_NAME)${FRAMEWORK_OBJ_EXT}\";"; \
|
||||
if [ "$(MAIN_MODEL_FILE)" = "" ]; then \
|
||||
echo " NSMainNibFile = \"\";"; \
|
||||
else \
|
||||
echo " NSMainNibFile = \"`echo $(MAIN_MODEL_FILE) | sed 's/.gmodel//'`\";"; \
|
||||
fi; \
|
||||
echo " NSPrincipalClass = \"$(PRINCIPAL_CLASS)\";"; \
|
||||
echo "}") >$@
|
||||
|
||||
# GNUstep bundles
|
||||
$(FRAMEWORK_VERSION_DIR_NAME)/Resources/Info-gnustep.plist: $(FRAMEWORK_VERSION_DIR_NAME)/Resources
|
||||
@(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
|
||||
echo " NSExecutable = \"$(INTERNAL_framework_NAME)${FRAMEWORK_OBJ_EXT}\";"; \
|
||||
if [ "$(MAIN_MODEL_FILE)" = "" ]; then \
|
||||
echo " NSMainNibFile = \"\";"; \
|
||||
else \
|
||||
echo " NSMainNibFile = \"`echo $(MAIN_MODEL_FILE) | sed 's/.gmodel//'`\";"; \
|
||||
fi; \
|
||||
echo " NSPrincipalClass = \"$(PRINCIPAL_CLASS)\";"; \
|
||||
echo "}") >$@
|
||||
|
||||
internal-framework-install:: $(FRAMEWORK_INSTALL_DIR) $(GNUSTEP_FRAMEWORKS_LIBRARIES) $(GNUSTEP_FRAMEWORKS_HEADERS)
|
||||
rm -rf $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_VERSION_DIR_NAME)
|
||||
$(TAR) cf - $(FRAMEWORK_DIR_NAME) | (cd $(FRAMEWORK_INSTALL_DIR); $(TAR) xf -)
|
||||
@(cd $(GNUSTEP_FRAMEWORKS_HEADERS); \
|
||||
if [ "$(HEADER_FILES)" != "" ]; then \
|
||||
if test -L "$(INTERNAL_framework_NAME)"; then \
|
||||
rm -f $(INTERNAL_framework_NAME); \
|
||||
fi; \
|
||||
$(LN_S) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_DIR_NAME)/Headers $(INTERNAL_framework_NAME); \
|
||||
fi;)
|
||||
@(cd $(GNUSTEP_FRAMEWORKS_LIBRARIES); \
|
||||
if test -f "$(FRAMEWORK_LIBRARY_FILE)"; then \
|
||||
rm -f $(FRAMEWORK_LIBRARY_FILE); \
|
||||
fi; \
|
||||
if test -f "$(VERSION_FRAMEWORK_LIBRARY_FILE)"; then \
|
||||
rm -f $(VERSION_FRAMEWORK_LIBRARY_FILE); \
|
||||
fi; \
|
||||
$(LN_S) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(FRAMEWORK_LIBRARY_FILE) $(FRAMEWORK_LIBRARY_FILE); \
|
||||
$(LN_S) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE) $(VERSION_FRAMEWORK_LIBRARY_FILE);)
|
||||
|
||||
$(FRAMEWORK_DIR_NAME)/Resources $(FRAMEWORK_INSTALL_DIR)::
|
||||
@$(MKDIRS) $@
|
||||
|
||||
$(GNUSTEP_FRAMEWORKS_LIBRARIES) :
|
||||
$(MKDIRS) $@
|
||||
|
||||
$(GNUSTEP_FRAMEWORKS_HEADERS) :
|
||||
$(MKDIRS) $@
|
||||
|
||||
internal-framework-uninstall::
|
||||
if [ "$(HEADER_FILES)" != "" ]; then \
|
||||
for file in $(HEADER_FILES) __done; do \
|
||||
if [ $$file != __done ]; then \
|
||||
rm -rf $(GNUSTEP_HEADERS)$(HEADER_FILES_INSTALL_DIR)/$$file ; \
|
||||
fi; \
|
||||
done; \
|
||||
fi; \
|
||||
rm -rf $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_DIR_NAME)
|
||||
|
||||
#
|
||||
# Cleaning targets
|
||||
#
|
||||
internal-framework-clean::
|
||||
rm -rf $(GNUSTEP_OBJ_DIR) $(FRAMEWORK_DIR_NAME) $(DERIVED_SOURCES)
|
||||
|
||||
internal-framework-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 $(DERIVED_SOURCES)
|
||||
|
||||
endif
|
||||
|
||||
endif
|
||||
# framework.make loaded
|
||||
|
||||
## Local variables:
|
||||
## mode: makefile
|
||||
## End:
|
|
@ -39,9 +39,9 @@ switch ( "${host_os}" )
|
|||
|
||||
case *nextstep4* :
|
||||
if ( $?DYLD_LIBRARY_PATH == 0 ) then
|
||||
setenv DYLD_LIBRARY_PATH "${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${tool_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}"
|
||||
setenv DYLD_LIBRARY_PATH "${GNUSTEP_NETWORK_ROOT}/Library/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${tool_path_part}:${GNUSTEP_USER_ROOT}/Library/${last_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/Library/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/Library/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}"
|
||||
else
|
||||
setenv DYLD_LIBRARY_PATH "${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${tool_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}:${DYLD_LIBRARY_PATH}"
|
||||
setenv DYLD_LIBRARY_PATH "${GNUSTEP_NETWORK_ROOT}/Library/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${tool_path_part}:${GNUSTEP_USER_ROOT}/Library/${last_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/Library/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/Library/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}:${DYLD_LIBRARY_PATH}"
|
||||
endif
|
||||
if ( $?additional_lib_paths == 1) then
|
||||
foreach dir (${additional_lib_paths})
|
||||
|
@ -56,9 +56,9 @@ switch ( "${host_os}" )
|
|||
|
||||
case *hpux* :
|
||||
if ( $?SHLIB_PATH == 0 ) then
|
||||
setenv SHLIB_PATH "${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${tool_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}"
|
||||
setenv SHLIB_PATH "${GNUSTEP_NETWORK_ROOT}/Library/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${tool_path_part}:${GNUSTEP_USER_ROOT}/Library/${last_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/Library/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/Library/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}"
|
||||
else
|
||||
setenv SHLIB_PATH "${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/{tool_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}:${SHLIB_PATH}"
|
||||
setenv SHLIB_PATH "${GNUSTEP_NETWORK_ROOT}/Library/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${tool_path_part}:${GNUSTEP_USER_ROOT}/Library/${last_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/Library/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/Library/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}:${SHLIB_PATH}"
|
||||
endif
|
||||
if ( $?additional_lib_paths == 1) then
|
||||
foreach dir (${additional_lib_paths})
|
||||
|
@ -71,9 +71,9 @@ switch ( "${host_os}" )
|
|||
endif
|
||||
|
||||
if ( $?LD_LIBRARY_PATH == 0 ) then
|
||||
setenv LD_LIBRARY_PATH "${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${tool_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}"
|
||||
setenv LD_LIBRARY_PATH "${GNUSTEP_NETWORK_ROOT}/Library/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${tool_path_part}:${GNUSTEP_USER_ROOT}/Library/${last_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/Library/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/Library/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}"
|
||||
else
|
||||
setenv LD_LIBRARY_PATH "${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/{tool_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}:${LD_LIBRARY_PATH}"
|
||||
setenv LD_LIBRARY_PATH "${GNUSTEP_NETWORK_ROOT}/Library/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/{tool_path_part}:${GNUSTEP_USER_ROOT}/Library/${last_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/Library/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/Library/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}:${LD_LIBRARY_PATH}"
|
||||
endif
|
||||
if ( $?additional_lib_paths == 1) then
|
||||
foreach dir (${additional_lib_paths})
|
||||
|
@ -88,9 +88,9 @@ switch ( "${host_os}" )
|
|||
|
||||
case * :
|
||||
if ( $?LD_LIBRARY_PATH == 0 ) then
|
||||
setenv LD_LIBRARY_PATH "${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${tool_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}"
|
||||
setenv LD_LIBRARY_PATH "${GNUSTEP_NETWORK_ROOT}/Library/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${tool_path_part}:${GNUSTEP_USER_ROOT}/Library/${last_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/Library/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/Library/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}"
|
||||
else
|
||||
setenv LD_LIBRARY_PATH "${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/{tool_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}:${LD_LIBRARY_PATH}"
|
||||
setenv LD_LIBRARY_PATH "${GNUSTEP_NETWORK_ROOT}/Library/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/{tool_path_part}:${GNUSTEP_USER_ROOT}/Library/${last_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/Library/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/Library/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}:${LD_LIBRARY_PATH}"
|
||||
endif
|
||||
if ( $?additional_lib_paths == 1) then
|
||||
foreach dir (${additional_lib_paths})
|
||||
|
|
|
@ -39,7 +39,7 @@ old_IFS="$IFS"
|
|||
IFS="
|
||||
"
|
||||
|
||||
lib_paths="$GNUSTEP_USER_ROOT/$last_path_part:$GNUSTEP_USER_ROOT/$tool_path_part:$GNUSTEP_LOCAL_ROOT/$last_path_part:$GNUSTEP_LOCAL_ROOT/$tool_path_part:$GNUSTEP_SYSTEM_ROOT/$last_path_part:$GNUSTEP_SYSTEM_ROOT/$tool_path_part"
|
||||
lib_paths="$GNUSTEP_USER_ROOT/Library/$last_path_part:$GNUSTEP_USER_ROOT/$last_path_part:$GNUSTEP_USER_ROOT/$tool_path_part:$GNUSTEP_LOCAL_ROOT/Library/$last_path_part:$GNUSTEP_LOCAL_ROOT/$last_path_part:$GNUSTEP_LOCAL_ROOT/$tool_path_part:$GNUSTEP_SYSTEM_ROOT/Library/$last_path_part:$GNUSTEP_SYSTEM_ROOT/$last_path_part:$GNUSTEP_SYSTEM_ROOT/$tool_path_part"
|
||||
|
||||
if [ -n "$additional_library_paths" ]; then
|
||||
for dir in $additional_library_paths; do
|
||||
|
|
90
rules.make
90
rules.make
|
@ -125,6 +125,10 @@ ALL_CPPFLAGS = $(CPPFLAGS) $(ADDITIONAL_CPPFLAGS) $(AUXILIARY_CPPFLAGS)
|
|||
ALL_OBJCFLAGS = $(INTERNAL_OBJCFLAGS) $(ADDITIONAL_OBJCFLAGS) \
|
||||
$(AUXILIARY_OBJCFLAGS) $(ADDITIONAL_INCLUDE_DIRS) \
|
||||
$(AUXILIARY_INCLUDE_DIRS) -I. $(SYSTEM_INCLUDES) \
|
||||
$(GNUSTEP_USER_FRAMEWORKS_HEADERS_FLAG) \
|
||||
$(GNUSTEP_LOCAL_FRAMEWORKS_HEADERS_FLAG) \
|
||||
$(GNUSTEP_NETWORK_FRAMEWORKS_HEADERS_FLAG) \
|
||||
-I$(GNUSTEP_SYSTEM_FRAMEWORKS_HEADERS) \
|
||||
$(GNUSTEP_HEADERS_FND_FLAG) $(GNUSTEP_HEADERS_GUI_FLAG) \
|
||||
$(GNUSTEP_HEADERS_TARGET_FLAG) $(GNUSTEP_USER_HEADERS_FLAG) \
|
||||
$(GNUSTEP_LOCAL_HEADERS_FLAG) $(GNUSTEP_NETWORK_HEADERS_FLAG) \
|
||||
|
@ -133,6 +137,10 @@ ALL_OBJCFLAGS = $(INTERNAL_OBJCFLAGS) $(ADDITIONAL_OBJCFLAGS) \
|
|||
ALL_CFLAGS = $(INTERNAL_CFLAGS) $(ADDITIONAL_CFLAGS) \
|
||||
$(AUXILIARY_CFLAGS) $(ADDITIONAL_INCLUDE_DIRS) \
|
||||
$(AUXILIARY_INCLUDE_DIRS) -I. $(SYSTEM_INCLUDES) \
|
||||
$(GNUSTEP_USER_FRAMEWORKS_HEADERS_FLAG) \
|
||||
$(GNUSTEP_LOCAL_FRAMEWORKS_HEADERS_FLAG) \
|
||||
$(GNUSTEP_NETWORK_FRAMEWORKS_HEADERS_FLAG) \
|
||||
-I$(GNUSTEP_SYSTEM_FRAMEWORKS_HEADERS) \
|
||||
$(GNUSTEP_HEADERS_FND_FLAG) $(GNUSTEP_HEADERS_GUI_FLAG) \
|
||||
$(GNUSTEP_HEADERS_TARGET_FLAG) $(GNUSTEP_USER_HEADERS_FLAG) \
|
||||
$(GNUSTEP_LOCAL_HEADERS_FLAG) $(GNUSTEP_NETWORK_HEADERS_FLAG) \
|
||||
|
@ -147,6 +155,12 @@ ALL_JAVAHFLAGS = $(INTERNAL_JAVAHFLAGS) $(ADDITIONAL_JAVAHFLAGS) \
|
|||
ALL_LDFLAGS = $(ADDITIONAL_LDFLAGS) $(AUXILIARY_LDFLAGS) $(GUI_LDFLAGS) \
|
||||
$(BACKEND_LDFLAGS) $(SYSTEM_LDFLAGS) $(INTERNAL_LDFLAGS)
|
||||
|
||||
ALL_FRAMEWORK_DIRS = $(ADDITIONAL_FRAMEWORK_DIRS) $(AUXILIARY_FRAMEWORK_DIRS) \
|
||||
$(GNUSTEP_USER_FRAMEWORKS_LIBRARIES_FLAG) \
|
||||
$(GNUSTEP_LOCAL_FRAMEWORKS_LIBRARIES_FLAG) \
|
||||
$(GNUSTEP_NETWORK_FRAMEWORKS_LIBRARIES_FLAG) \
|
||||
-L$(GNUSTEP_SYSTEM_FRAMEWORKS_LIBRARIES)
|
||||
|
||||
ALL_LIB_DIRS = $(ADDITIONAL_LIB_DIRS) $(AUXILIARY_LIB_DIRS) \
|
||||
$(GNUSTEP_USER_LIBRARIES_FLAG) $(GNUSTEP_USER_TARGET_LIBRARIES_FLAG) \
|
||||
$(GNUSTEP_LOCAL_LIBRARIES_FLAG) $(GNUSTEP_LOCAL_TARGET_LIBRARIES_FLAG) \
|
||||
|
@ -196,6 +210,61 @@ $(GNUSTEP_OBJ_DIR)/%${OEXT} : %.m
|
|||
|
||||
# The magical application rules, thank you GNU make!
|
||||
%.build:
|
||||
@(if [ "$(FRAMEWORK_NAME)" != "" ] && [ "$(OPERATION)" = "all" ]; then \
|
||||
echo Build public headers for $(TARGET_TYPE) $*...; \
|
||||
$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \
|
||||
build-framework-headers \
|
||||
INTERNAL_$(TARGET_TYPE)_NAME=$* \
|
||||
SUBPROJECTS="$($*_SUBPROJECTS)" \
|
||||
OBJC_FILES="$($*_OBJC_FILES)" \
|
||||
C_FILES="$($*_C_FILES)" \
|
||||
JAVA_FILES="$($*_JAVA_FILES)" \
|
||||
JAVA_JNI_FILES="$($*_JAVA_JNI_FILES)" \
|
||||
OBJ_FILES="$($*_OBJ_FILES)" \
|
||||
PSWRAP_FILES="$($*_PSWRAP_FILES)" \
|
||||
HEADER_FILES="$($*_HEADER_FILES)" \
|
||||
TEXI_FILES="$($*_TEXI_FILES)" \
|
||||
GSDOC_FILES="$($*_GSDOC_FILES)" \
|
||||
TEXT_MAIN="$($*_TEXT_MAIN)" \
|
||||
HEADER_FILES_DIR="$($*_HEADER_FILES_DIR)" \
|
||||
HEADER_FILES_INSTALL_DIR="$($*_HEADER_FILES_INSTALL_DIR)" \
|
||||
COMPONENTS="$($*_COMPONENTS)" \
|
||||
LANGUAGES="$($*_LANGUAGES)" \
|
||||
HAS_GSWCOMPONENTS="$($*_HAS_GSWCOMPONENTS)" \
|
||||
GSWAPP_INFO_PLIST="$($*_GSWAPP_INFO_PLIST)" \
|
||||
WEBSERVER_RESOURCE_FILES="$($*_WEBSERVER_RESOURCE_FILES)" \
|
||||
LOCALIZED_WEBSERVER_RESOURCE_FILES="$($*_LOCALIZED_WEBSERVER_RESOURCE_FILES)" \
|
||||
WEBSERVER_RESOURCE_DIRS="$($*_WEBSERVER_RESOURCE_DIRS)" \
|
||||
LOCALIZED_RESOURCE_FILES="$($*_LOCALIZED_RESOURCE_FILES)" \
|
||||
RESOURCE_FILES="$($*_RESOURCE_FILES)" \
|
||||
MAIN_MODEL_FILE="$($*_MAIN_MODEL_FILE)" \
|
||||
RESOURCE_DIRS="$($*_RESOURCE_DIRS)" \
|
||||
BUNDLE_LIBS="$($*_BUNDLE_LIBS) $(BUNDLE_LIBS)" \
|
||||
SERVICE_INSTALL_DIR="$($*_SERVICE_INSTALL_DIR)" \
|
||||
APPLICATION_ICON="$($*_APPLICATION_ICON)" \
|
||||
PALETTE_ICON="$($*_PALETTE_ICON)" \
|
||||
PRINCIPAL_CLASS="$($*_PRINCIPAL_CLASS)" \
|
||||
DLL_DEF="$($*_DLL_DEF)" \
|
||||
ADDITIONAL_INCLUDE_DIRS="$(ADDITIONAL_INCLUDE_DIRS) \
|
||||
$($*_INCLUDE_DIRS)" \
|
||||
ADDITIONAL_GUI_LIBS="$($*_GUI_LIBS) $(ADDITIONAL_GUI_LIBS)" \
|
||||
ADDITIONAL_TOOL_LIBS="$($*_TOOL_LIBS) $(ADDITIONAL_TOOL_LIBS)" \
|
||||
ADDITIONAL_OBJC_LIBS="$($*_OBJC_LIBS) $(ADDITIONAL_OBJC_LIBS)" \
|
||||
ADDITIONAL_LIBRARY_LIBS="$($*_LIBS) $($*_LIBRARY_LIBS) $(ADDITIONAL_LIBRARY_LIBS)" \
|
||||
ADDITIONAL_LIB_DIRS="$($*_LIB_DIRS) $(ADDITIONAL_LIB_DIRS)" \
|
||||
ADDITIONAL_LDFLAGS="$($*_LDFLAGS) $(ADDITIONAL_LDFLAGS)" \
|
||||
LIBRARIES_DEPEND_UPON="$(shell $(WHICH_LIB_SCRIPT) \
|
||||
$(LIB_DIRS_NO_SYSTEM) $($*_LIB_DIRS) $(ADDITIONAL_LIB_DIRS) \
|
||||
$(LIBRARIES_DEPEND_UPON) \
|
||||
$($*_LIBRARIES_DEPEND_UPON) debug=$(debug) profile=$(profile) \
|
||||
shared=$(shared) libext=$(LIBEXT) \
|
||||
shared_libext=$(SHARED_LIBEXT))" \
|
||||
SCRIPTS_DIRECTORY="$($*_SCRIPTS_DIRECTORY)" \
|
||||
CHECK_SCRIPT_DIRS="$($*_SCRIPT_DIRS)"; \
|
||||
if [ "$($*_SUBPROJECTS)" != "" ]; then subprjs="$($*_SUBPROJECTS)"; \
|
||||
else subprjs="__dummy__";\
|
||||
fi;\
|
||||
fi;)
|
||||
@(echo Making $(OPERATION) for $(TARGET_TYPE) $*...; \
|
||||
if [ "$($*_SUBPROJECTS)" != "" ]; then subprjs="$($*_SUBPROJECTS)"; \
|
||||
else subprjs="__dummy__";\
|
||||
|
@ -207,7 +276,11 @@ $(GNUSTEP_OBJ_DIR)/%${OEXT} : %.m
|
|||
mf=Makefile; \
|
||||
echo "WARNING: No $(MAKEFILE_NAME) found for subproject $ff; using 'Makefile'"; \
|
||||
fi; \
|
||||
if $(MAKE) -C $$f -f $$mf --no-keep-going $(OPERATION); then \
|
||||
if $(MAKE) -C $$f -f $$mf --no-keep-going $(OPERATION) \
|
||||
FRAMEWORK_NAME="$(FRAMEWORK_NAME)" \
|
||||
FRAMEWORK_VERSION_DIR_NAME="../$(FRAMEWORK_VERSION_DIR_NAME)" \
|
||||
DERIVED_SOURCES="../$(DERIVED_SOURCES)" \
|
||||
; then \
|
||||
:; \
|
||||
else exit $$?; \
|
||||
fi; \
|
||||
|
@ -334,6 +407,21 @@ endif
|
|||
# Rules processed second time
|
||||
endif
|
||||
|
||||
#
|
||||
# Common variables for frameworks
|
||||
#
|
||||
ifeq ($(CURRENT_VERSION_NAME),)
|
||||
CURRENT_VERSION_NAME := A
|
||||
endif
|
||||
ifeq ($(DEPLOY_WITH_CURRENT_VERSION),)
|
||||
DEPLOY_WITH_CURRENT_VERSION := yes
|
||||
endif
|
||||
|
||||
FRAMEWORK_NAME := $(strip $(FRAMEWORK_NAME))
|
||||
FRAMEWORK_DIR_NAME := $(FRAMEWORK_NAME:=.framework)
|
||||
FRAMEWORK_VERSION_DIR_NAME := $(FRAMEWORK_DIR_NAME)/Versions/$(CURRENT_VERSION_NAME)
|
||||
|
||||
|
||||
ifeq ($(OBJ_DIR_RULE),)
|
||||
OBJ_DIR_RULE = defined
|
||||
# The rule to create the objects file directory. This rule is here so that it
|
||||
|
|
|
@ -52,6 +52,8 @@ $(SUBPROJECT_NAME):
|
|||
else
|
||||
# This part gets included the second time make is invoked.
|
||||
|
||||
FRAMEWORK_HEADER_FILES := $(patsubst %.h,$(FRAMEWORK_VERSION_DIR_NAME)/Headers/%.h,$(HEADER_FILES))
|
||||
|
||||
#
|
||||
# Internal targets
|
||||
#
|
||||
|
@ -60,18 +62,66 @@ else
|
|||
# Compilation targets
|
||||
#
|
||||
internal-subproj-all:: before-all before-$(TARGET)-all $(GNUSTEP_OBJ_DIR) \
|
||||
$(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) \
|
||||
after-$(TARGET)-all after-all
|
||||
$(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) \
|
||||
framework-resource-files localized-framework-resource-files \
|
||||
after-$(TARGET)-all after-all
|
||||
|
||||
$(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT): $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(OBJ_FILES)
|
||||
$(OBJ_MERGE_CMD)
|
||||
|
||||
before-$(TARGET)-all::
|
||||
before-$(TARGET)-all:: $(FRAMEWORK_HEADER_FILES)
|
||||
|
||||
after-$(TARGET)-all::
|
||||
|
||||
after-all::
|
||||
|
||||
build-framework-headers:: $(FRAMEWORK_HEADER_FILES)
|
||||
|
||||
$(FRAMEWORK_HEADER_FILES):: $(HEADER_FILES)
|
||||
if [ "$(FRAMEWORK_NAME)" != "" ]; then \
|
||||
if [ "$(HEADER_FILES)" != "" ]; then \
|
||||
$(MKDIRS) $(FRAMEWORK_VERSION_DIR_NAME)/Headers; \
|
||||
if test ! -L "$(DERIVED_SOURCES)/$(INTERNAL_framework_NAME)"; then \
|
||||
$(LN_S) ../$(FRAMEWORK_DIR_NAME)/Headers \
|
||||
$(DERIVED_SOURCES)/$(INTERNAL_framework_NAME); \
|
||||
fi; \
|
||||
for file in $(HEADER_FILES) __done; do \
|
||||
if [ $$file != __done ]; then \
|
||||
$(INSTALL_DATA) ./$$file \
|
||||
$(FRAMEWORK_VERSION_DIR_NAME)/Headers/$$file ; \
|
||||
fi; \
|
||||
done; \
|
||||
fi; \
|
||||
fi;
|
||||
|
||||
framework-resource-files::
|
||||
@(if [ "$(FRAMEWORK_NAME)" != "" ]; then \
|
||||
if [ "$(RESOURCE_FILES)" != "" ]; then \
|
||||
$(MKDIRS) $(FRAMEWORK_VERSION_DIR_NAME)/Resources; \
|
||||
echo "Copying resources into the framework wrapper..."; \
|
||||
for f in "$(RESOURCE_FILES)"; do \
|
||||
cp -r $$f $(FRAMEWORK_VERSION_DIR_NAME)/Resources; \
|
||||
done; \
|
||||
fi; \
|
||||
fi;)
|
||||
|
||||
localized-framework-resource-files::
|
||||
@(if [ "$(FRAMEWORK_NAME)" != "" ]; then \
|
||||
if [ "$(LOCALIZED_RESOURCE_FILES)" != "" ]; then \
|
||||
echo "Copying localized resources into the framework wrapper..."; \
|
||||
for l in $(LANGUAGES); do \
|
||||
if [ ! -f $$l.lproj ]; then \
|
||||
$(MKDIRS) $(FRAMEWORK_VERSION_DIR_NAME)/Resources/$$l.lproj; \
|
||||
fi; \
|
||||
for f in $(LOCALIZED_RESOURCE_FILES); do \
|
||||
if [ -f $$l.lproj/$$f ]; then \
|
||||
cp -r $$l.lproj/$$f $(FRAMEWORK_VERSION_DIR_NAME)/Resources/$$l.lproj; \
|
||||
fi; \
|
||||
done; \
|
||||
done; \
|
||||
fi; \
|
||||
fi;)
|
||||
|
||||
#
|
||||
# Installation targets
|
||||
#
|
||||
|
@ -88,8 +138,13 @@ internal-install-subproj-headers::
|
|||
if [ "$(HEADER_FILES)" != "" ]; then \
|
||||
for file in $(HEADER_FILES) __done; do \
|
||||
if [ $$file != __done ]; then \
|
||||
$(INSTALL_DATA) $(HEADER_FILES_DIR)/$$file \
|
||||
if [ "$(FRAMEWORK_NAME)" == "" ]; then \
|
||||
$(INSTALL_DATA) $(HEADER_FILES_DIR)/$$file \
|
||||
$(GNUSTEP_HEADERS)$(HEADER_FILES_INSTALL_DIR)/$$file ; \
|
||||
else; \
|
||||
$(INSTALL_DATA) $(HEADER_FILES_DIR)/$$file \
|
||||
$(FRAMEWORK_VERSION_DIR_NAME)/$$file ; \
|
||||
fi; \
|
||||
fi; \
|
||||
done; \
|
||||
fi
|
||||
|
@ -101,7 +156,9 @@ before-uninstall after-uninstall::
|
|||
internal-uninstall-headers::
|
||||
for file in $(HEADER_FILES) __done; do \
|
||||
if [ $$file != __done ]; then \
|
||||
rm -f $(GNUSTEP_HEADERS)$(HEADER_FILES_INSTALL_DIR)/$$file ; \
|
||||
if [ "$(FRAMEWORK_NAME)" == "" ]; then \
|
||||
rm -f $(GNUSTEP_HEADERS)$(HEADER_FILES_INSTALL_DIR)/$$file ; \
|
||||
fi; \
|
||||
fi; \
|
||||
done
|
||||
|
||||
|
@ -124,3 +181,7 @@ endif
|
|||
|
||||
endif
|
||||
# subproject.make loaded
|
||||
|
||||
## Local variables:
|
||||
## mode: makefile
|
||||
## End:
|
||||
|
|
109
target.make
109
target.make
|
@ -381,6 +381,24 @@ SHARED_LIB_LINK_CMD = \
|
|||
$(LN_S) $(VERSION_LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
|
||||
$(LN_S) $(SONAME_LIBRARY_FILE) $(LIBRARY_FILE); \
|
||||
)
|
||||
SHARED_FRAMEWORK_LINK_CMD = \
|
||||
$(CC) $(SHARED_LD_PREFLAGS) -shared -Wl,-soname,$(VERSION_FRAMEWORK_LIBRARY_FILE) \
|
||||
-o $(FRAMEWORK_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE) \
|
||||
$^ $(ALL_FRAMEWORK_DIRS) \
|
||||
$(GNUSTEP_USER_TARGET_LIBRARIES_FLAG) \
|
||||
$(GNUSTEP_USER_LIBRARIES_FLAG) \
|
||||
$(GNUSTEP_LOCAL_TARGET_LIBRARIES_FLAG) \
|
||||
$(GNUSTEP_LOCAL_LIBRARIES_FLAG) \
|
||||
-L$(GNUSTEP_SYSTEM_LIBRARIES) \
|
||||
-L$(GNUSTEP_SYSTEM_TARGET_LIBRARIES) \
|
||||
$(SYSTEM_LIB_DIR) \
|
||||
$(ADDITIONAL_LIB_DIRS) \
|
||||
$(LIBRARIES_DEPEND_UPON) \
|
||||
$(TARGET_SYSTEM_LIBS) \
|
||||
$(SHARED_LD_POSTFLAGS);\
|
||||
(cd $(FRAMEWORK_LIBRARY_DIR_NAME); \
|
||||
rm -f $(FRAMEWORK_LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE) $(FRAMEWORK_LIBRARY_FILE))
|
||||
AFTER_INSTALL_SHARED_LIB_COMMAND = \
|
||||
(cd $(GNUSTEP_LIBRARIES); \
|
||||
rm -f $(LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
|
||||
|
@ -420,6 +438,13 @@ SHARED_LIB_LINK_CMD = \
|
|||
(cd $(GNUSTEP_OBJ_DIR); \
|
||||
rm -f $(LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_LIBRARY_FILE) $(LIBRARY_FILE))
|
||||
SHARED_FRAMEWORK_LINK_CMD = \
|
||||
$(CC) -shared -Wl,-soname,$(VERSION_FRAMEWORK_LIBRARY_FILE) \
|
||||
-o $(FRAMEWORK_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE) \
|
||||
$^ /usr/lib/c++rt0.o \
|
||||
(cd $(FRAMEWORK_LIBRARY_DIR_NAME); \
|
||||
rm -f $(FRAMEWORK_LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE) $(FRAMEWORK_LIBRARY_FILE))
|
||||
|
||||
SHARED_CFLAGS += -fPIC
|
||||
SHARED_LIBEXT = .so
|
||||
|
@ -446,10 +471,39 @@ ifeq ($(findstring freebsdelf, $(GNUSTEP_TARGET_OS)), freebsdelf)
|
|||
HAVE_SHARED_LIBS = yes
|
||||
SHARED_LIB_LINK_CMD = \
|
||||
$(CC) -shared -Wl,-soname,$(VERSION_LIBRARY_FILE) \
|
||||
-o $(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) $^ ;\
|
||||
-o $(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) $^ \
|
||||
$(GNUSTEP_USER_TARGET_LIBRARIES_FLAG) \
|
||||
$(GNUSTEP_USER_LIBRARIES_FLAG) \
|
||||
$(GNUSTEP_LOCAL_TARGET_LIBRARIES_FLAG) \
|
||||
$(GNUSTEP_LOCAL_LIBRARIES_FLAG) \
|
||||
-L$(GNUSTEP_SYSTEM_LIBRARIES) \
|
||||
-L$(GNUSTEP_SYSTEM_TARGET_LIBRARIES) \
|
||||
$(SYSTEM_LIB_DIR) \
|
||||
$(ADDITIONAL_LIB_DIRS) \
|
||||
$(LIBRARIES_DEPEND_UPON) \
|
||||
$(TARGET_SYSTEM_LIBS) \
|
||||
$(SHARED_LD_POSTFLAGS);\
|
||||
(cd $(GNUSTEP_OBJ_DIR); \
|
||||
rm -f $(LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_LIBRARY_FILE) $(LIBRARY_FILE))
|
||||
SHARED_FRAMEWORK_LINK_CMD = \
|
||||
$(CC) -shared -Wl,-soname,$(VERSION_FRAMEWORK_LIBRARY_FILE) \
|
||||
-o $(FRAMEWORK_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE) \
|
||||
$^ $(ALL_FRAMEWORK_DIRS) \
|
||||
$(GNUSTEP_USER_TARGET_LIBRARIES_FLAG) \
|
||||
$(GNUSTEP_USER_LIBRARIES_FLAG) \
|
||||
$(GNUSTEP_LOCAL_TARGET_LIBRARIES_FLAG) \
|
||||
$(GNUSTEP_LOCAL_LIBRARIES_FLAG) \
|
||||
-L$(GNUSTEP_SYSTEM_LIBRARIES) \
|
||||
-L$(GNUSTEP_SYSTEM_TARGET_LIBRARIES) \
|
||||
$(SYSTEM_LIB_DIR) \
|
||||
$(ADDITIONAL_LIB_DIRS) \
|
||||
$(LIBRARIES_DEPEND_UPON) \
|
||||
$(TARGET_SYSTEM_LIBS) \
|
||||
$(SHARED_LD_POSTFLAGS);\
|
||||
(cd $(FRAMEWORK_LIBRARY_DIR_NAME); \
|
||||
rm -f $(FRAMEWORK_LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE) $(FRAMEWORK_LIBRARY_FILE))
|
||||
OBJ_MERGE_CMD = \
|
||||
$(CC) -nostdlib -r -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;
|
||||
|
||||
|
@ -487,6 +541,13 @@ SHARED_LIB_LINK_CMD = \
|
|||
(cd $(GNUSTEP_OBJ_DIR); \
|
||||
rm -f $(LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_LIBRARY_FILE) $(LIBRARY_FILE))
|
||||
SHARED_FRAMEWORK_LINK_CMD = \
|
||||
$(SHARED_LD) -x -Bshareable -Bforcearchive \
|
||||
-o $(FRAMEWORK_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE) \
|
||||
$^ /usr/lib/c++rt0.o;\
|
||||
(cd $(FRAMEWORK_LIBRARY_DIR_NAME); \
|
||||
rm -f $(FRAMEWORK_LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE) $(FRAMEWORK_LIBRARY_FILE))
|
||||
|
||||
SHARED_CFLAGS += -shared -fpic
|
||||
SHARED_LIBEXT = .so
|
||||
|
@ -517,6 +578,13 @@ SHARED_LIB_LINK_CMD = \
|
|||
(cd $(GNUSTEP_OBJ_DIR); \
|
||||
rm -f $(LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_LIBRARY_FILE) $(LIBRARY_FILE))
|
||||
SHARED_FRAMEWORK_LINK_CMD = \
|
||||
$(CC) -shared -Wl,-soname,$(VERSION_FRAMEWORK_LIBRARY_FILE) \
|
||||
-o $(FRAMEWORK_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE) \
|
||||
$^ ;\
|
||||
(cd $(FRAMEWORK_LIBRARY_DIR_NAME); \
|
||||
rm -f $(FRAMEWORK_LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE) $(FRAMEWORK_LIBRARY_FILE))
|
||||
OBJ_MERGE_CMD = \
|
||||
$(CC) -nostdlib -r -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;
|
||||
|
||||
|
@ -555,6 +623,13 @@ SHARED_LIB_LINK_CMD = \
|
|||
(cd $(GNUSTEP_OBJ_DIR); \
|
||||
rm -f $(LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_LIBRARY_FILE) $(LIBRARY_FILE))
|
||||
SHARED_FRAMEWORK_LINK_CMD = \
|
||||
$(SHARED_LD) $(SHARED_LD_PREFLAGS) -x -Bshareable -Bforcearchive \
|
||||
-o $(FRAMEWORK_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE) \
|
||||
$^ /usr/lib/c++rt0.o $(SHARED_LD_POSTFLAGS); \
|
||||
(cd $(FRAMEWORK_LIBRARY_DIR_NAME); \
|
||||
rm -f $(FRAMEWORK_LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE) $(FRAMEWORK_LIBRARY_FILE))
|
||||
|
||||
SHARED_CFLAGS += -shared -fpic
|
||||
SHARED_LIBEXT = .so
|
||||
|
@ -585,6 +660,13 @@ SHARED_LIB_LINK_CMD = \
|
|||
(cd $(GNUSTEP_OBJ_DIR); \
|
||||
rm -f $(LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_LIBRARY_FILE) $(LIBRARY_FILE))
|
||||
SHARED_FRAMEWORK_LINK_CMD = \
|
||||
$(CC) -shared -Wl,-soname,$(VERSION_FRAMEWORK_LIBRARY_FILE) \
|
||||
-o $(FRAMEWORK_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE) \
|
||||
$^ ;\
|
||||
(cd $(FRAMEWORK_LIBRARY_DIR_NAME); \
|
||||
rm -f $(FRAMEWORK_LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE) $(FRAMEWORK_LIBRARY_FILE))
|
||||
OBJ_MERGE_CMD = \
|
||||
$(CC) -nostdlib -r -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;
|
||||
|
||||
|
@ -719,6 +801,24 @@ SHARED_LIB_LINK_CMD = \
|
|||
$(LN_S) $(VERSION_LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
|
||||
$(LN_S) $(SONAME_LIBRARY_FILE) $(LIBRARY_FILE); \
|
||||
)
|
||||
SHARED_FRAMEWORK_LINK_CMD = \
|
||||
$(CC) $(SHARED_LD_PREFLAGS) -G -Wl,-h,$(VERSION_FRAMEWORK_LIBRARY_FILE) \
|
||||
-o $(FRAMEWORK_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE) \
|
||||
$^ $(ALL_FRAMEWORK_DIRS) \
|
||||
$(GNUSTEP_USER_TARGET_LIBRARIES_FLAG) \
|
||||
$(GNUSTEP_USER_LIBRARIES_FLAG) \
|
||||
$(GNUSTEP_LOCAL_TARGET_LIBRARIES_FLAG) \
|
||||
$(GNUSTEP_LOCAL_LIBRARIES_FLAG) \
|
||||
-L$(GNUSTEP_SYSTEM_LIBRARIES) \
|
||||
-L$(GNUSTEP_SYSTEM_TARGET_LIBRARIES) \
|
||||
$(SYSTEM_LIB_DIR) \
|
||||
$(ADDITIONAL_LIB_DIRS) \
|
||||
$(LIBRARIES_DEPEND_UPON) \
|
||||
$(TARGET_SYSTEM_LIBS) \
|
||||
$(SHARED_LD_POSTFLAGS);\
|
||||
(cd $(FRAMEWORK_LIBRARY_DIR_NAME); \
|
||||
rm -f $(FRAMEWORK_LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE) $(FRAMEWORK_LIBRARY_FILE))
|
||||
AFTER_INSTALL_SHARED_LIB_COMMAND = \
|
||||
(cd $(GNUSTEP_LIBRARIES); \
|
||||
rm -f $(LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
|
||||
|
@ -762,6 +862,13 @@ SHARED_LIB_LINK_CMD = \
|
|||
(cd $(GNUSTEP_OBJ_DIR); \
|
||||
rm -f $(LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_LIBRARY_FILE) $(LIBRARY_FILE))
|
||||
SHARED_FRAMEWORK_LINK_CMD = \
|
||||
$(CC) $(SHARED_LD_PREFLAGS) -shared -o $(VERSION_FRAMEWORK_LIBRARY_FILE) $^ \
|
||||
$(SHARED_LD_POSTFLAGS);\
|
||||
mv $(VERSION_FRAMEWORK_LIBRARY_FILE) $(FRAMEWORK_LIBRARY_DIR_NAME);\
|
||||
(cd $(FRAMEWORK_LIBRARY_DIR_NAME); \
|
||||
rm -f $(FRAMEWORK_LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE) $(FRAMEWORK_LIBRARY_FILE))
|
||||
|
||||
SHARED_CFLAGS += -fpic -fPIC
|
||||
SHARED_LIBEXT = .so
|
||||
|
|
|
@ -96,7 +96,7 @@ internal-tool-all:: before-$(TARGET)-all $(GNUSTEP_OBJ_DIR) \
|
|||
$(GNUSTEP_OBJ_DIR)/$(INTERNAL_tool_NAME)$(EXEEXT): $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) $(OBJ_FILES)
|
||||
$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ \
|
||||
$(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(OBJ_FILES) $(SUBPROJECT_OBJ_FILES) \
|
||||
$(ALL_LIB_DIRS) $(ALL_TOOL_LIBS)
|
||||
$(ALL_FRAMEWORK_DIRS) $(ALL_LIB_DIRS) $(ALL_TOOL_LIBS)
|
||||
|
||||
before-$(TARGET)-all::
|
||||
|
||||
|
|
Loading…
Reference in a new issue