mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
* GNUmakefile.in (install): Don't make Makefiles link
* target.make (darwin/GNU): Use $(CC) to link library. * Instance/framework.make: More comments. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@21129 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
662c048e3e
commit
ac5ef60fbd
4 changed files with 11 additions and 7 deletions
|
@ -1,3 +1,9 @@
|
|||
2005-04-19 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* GNUmakefile.in (install): Don't make Makefiles link
|
||||
* target.make (darwin/GNU): Use $(CC) to link library.
|
||||
* Instance/framework.make: More comments.
|
||||
|
||||
2005-04-15 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* Instance/framework.make: Add top-level symlink for all darwin
|
||||
|
|
|
@ -144,9 +144,6 @@ install: all @GNUSTEP_MOVE_OBSOLETE@
|
|||
$(makedir)/Instance/Shared \
|
||||
$(makedir)/Instance/Documentation)
|
||||
-$(EC) rm -f $(GNUSTEP_SYSTEM_ROOT)/Makefiles
|
||||
ifeq ($(HAS_LN_S), yes)
|
||||
$(EC) (cd $(GNUSTEP_SYSTEM_ROOT); $(LN_S) @MAKEFILES_SUFFIX@ Makefiles)
|
||||
endif
|
||||
$(EC)(echo "Installing gnustep-make support software"; \
|
||||
$(INSTALL_PROGRAM) -m 755 which_lib$(EXEEXT) \
|
||||
$(makedir)/$(GNUSTEP_TARGET_DIR); \
|
||||
|
|
|
@ -388,7 +388,8 @@ endif
|
|||
ifeq ($(findstring darwin, $(GNUSTEP_TARGET_OS)), darwin)
|
||||
# When building native frameworks on Apple, we need to create a
|
||||
# top-level symlink xxx.framework/xxx ---> the framework shared
|
||||
# library
|
||||
# library. On Darwin (non-Apple) we do this as well since we can partially
|
||||
# emulate frameworks (see the ld_lib_path.sh comments on this).
|
||||
|
||||
build-framework:: $(FRAMEWORK_FILE) \
|
||||
shared-instance-bundle-all \
|
||||
|
|
|
@ -301,16 +301,16 @@ ifeq ($(CC_BUNDLE), no)
|
|||
|
||||
INTERNAL_LDFLAGS += -flat_namespace -undefined warning
|
||||
|
||||
SHARED_LD_PREFLAGS += -noall_load -read_only_relocs warning
|
||||
SHARED_LD_PREFLAGS += -Wl,-noall_load -read_only_relocs warning
|
||||
# Useful flag: -Wl,-single_module. This flag only
|
||||
# works starting with 10.3. libs w/ffcall don't link on darwin/ix86 without it.
|
||||
ifeq ($(findstring darwin7, $(GNUSTEP_TARGET_OS)), darwin7)
|
||||
SHARED_LD_PREFLAGS += -single_module
|
||||
endif
|
||||
SHARED_LIB_LINK_CMD = \
|
||||
/usr/bin/libtool \
|
||||
$(CC) \
|
||||
$(SHARED_LD_PREFLAGS) \
|
||||
$(ARCH_FLAGS) -dynamic \
|
||||
$(ARCH_FLAGS) -dynamic -dynamiclib \
|
||||
$(DYLIB_COMPATIBILITY_VERSION) \
|
||||
$(DYLIB_CURRENT_VERSION) \
|
||||
-install_name $(LIB_LINK_INSTALL_NAME) \
|
||||
|
|
Loading…
Reference in a new issue