mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Fix LDFLAGS
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@4898 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
6c44b8c55a
commit
c2d8f7c90f
10 changed files with 16 additions and 9 deletions
|
@ -1,3 +1,10 @@
|
|||
1999-09-14 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* common.make, config.make.in: Remove -o from LDFLAGS.
|
||||
* application.make, bundle.make, ctool.make, objc.make,
|
||||
service.make, target.make, test-library.make, tool.make: Add -o
|
||||
in LD command.
|
||||
|
||||
1999-09-11 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* target.make: Remove two erronous newlines in the MacOSX section.
|
||||
|
|
|
@ -101,7 +101,7 @@ endif
|
|||
#
|
||||
|
||||
$(APP_FILE): $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES)
|
||||
$(LD) $(ALL_LDFLAGS) $(LDOUT)$@ $(C_OBJ_FILES) $(OBJC_OBJ_FILES) \
|
||||
$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ $(C_OBJ_FILES) $(OBJC_OBJ_FILES) \
|
||||
$(SUBPROJECT_OBJ_FILES) \
|
||||
$(ALL_LIB_DIRS) $(ALL_GUI_LIBS)
|
||||
ifeq ($(OBJC_COMPILER), NeXT)
|
||||
|
|
|
@ -96,7 +96,7 @@ build-bundle:: $(BUNDLE_FILE) bundle-resource-files
|
|||
|
||||
$(BUNDLE_FILE) : $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES)
|
||||
$(BUNDLE_LD) $(BUNDLE_LDFLAGS) $(ALL_LDFLAGS) \
|
||||
$(LDOUT)$(BUNDLE_FILE) \
|
||||
-o $(LDOUT)$(BUNDLE_FILE) \
|
||||
$(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) \
|
||||
$(ALL_LIB_DIRS) $(ALL_BUNDLE_LIBS)
|
||||
|
||||
|
|
|
@ -250,7 +250,7 @@ endif
|
|||
ifeq ($(profile), yes)
|
||||
ADDITIONAL_FLAGS += -pg
|
||||
ifeq ($(LD), $(CC))
|
||||
LDFLAGS = -pg -o
|
||||
LDFLAGS = -pg
|
||||
endif
|
||||
OBJ_DIR_PREFIX += profile_
|
||||
LIBRARY_NAME_SUFFIX := p$(LIBRARY_NAME_SUFFIX)
|
||||
|
|
|
@ -37,7 +37,7 @@ LN_S = @LN_S@
|
|||
|
||||
LD = $(CC)
|
||||
LDOUT =
|
||||
LDFLAGS = @LDFLAGS@ -o
|
||||
LDFLAGS = @LDFLAGS@
|
||||
|
||||
AR = @AR@
|
||||
AROUT =
|
||||
|
|
|
@ -75,7 +75,7 @@ internal-ctool-all:: before-$(TARGET)-all $(GNUSTEP_OBJ_DIR) \
|
|||
$(GNUSTEP_OBJ_DIR)/$(INTERNAL_ctool_NAME)$(EXEEXT) after-$(TARGET)-all
|
||||
|
||||
$(GNUSTEP_OBJ_DIR)/$(INTERNAL_ctool_NAME)$(EXEEXT): $(C_OBJ_FILES) $(SUBPROJECT_OBJ_FILES)
|
||||
$(LD) $(ALL_LDFLAGS) $(LDOUT)$@ \
|
||||
$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ \
|
||||
$(C_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) \
|
||||
$(ALL_LIB_DIRS) $(ALL_TOOL_LIBS)
|
||||
|
||||
|
|
|
@ -75,7 +75,7 @@ ALL_OBJC_LIBS := \
|
|||
|
||||
$(GNUSTEP_OBJ_DIR)/$(INTERNAL_objc_program_NAME)$(EXEEXT): \
|
||||
$(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES)
|
||||
$(LD) $(ALL_LDFLAGS) $(LDOUT)$@ \
|
||||
$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ \
|
||||
$(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) \
|
||||
$(ALL_LIB_DIRS) $(ALL_OBJC_LIBS)
|
||||
|
||||
|
|
|
@ -84,7 +84,7 @@ SERVICE_FILE = $(SERVICE_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)/$(INTE
|
|||
|
||||
|
||||
$(SERVICE_FILE): $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES)
|
||||
$(LD) $(ALL_LDFLAGS) $(LDOUT)$@ $(C_OBJ_FILES) $(OBJC_OBJ_FILES) \
|
||||
$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ $(C_OBJ_FILES) $(OBJC_OBJ_FILES) \
|
||||
$(SUBPROJECT_OBJ_FILES) \
|
||||
$(ALL_LIB_DIRS) $(ALL_GUI_LIBS)
|
||||
|
||||
|
|
|
@ -146,7 +146,7 @@ SHARED_LIB_LINK_CMD = \
|
|||
else
|
||||
SHARED_LIB_LINK_CMD = \
|
||||
/bin/libtool -dynamic -read_only_relocs suppress $(ARCH_FLAGS) \
|
||||
-install_name $(GNUSTEP_SYSTEM_ROOT)/$(TARGET_LIB_DIR)/$(LIBRARY_FILE) $(ALL_LDFLAGS) $@ \
|
||||
-install_name $(GNUSTEP_SYSTEM_ROOT)/$(TARGET_LIB_DIR)/$(LIBRARY_FILE) $(ALL_LDFLAGS) -o $@ \
|
||||
-framework System \
|
||||
$(ALL_LIB_DIRS) $(LIBRARIES_DEPEND_UPON) \
|
||||
$(LIBRARIES_FOUNDATION_DEPEND_UPON) $^; \
|
||||
|
|
|
@ -76,7 +76,7 @@ internal-tool-all:: before-$(TARGET)-all $(GNUSTEP_OBJ_DIR) \
|
|||
$(GNUSTEP_OBJ_DIR)/$(INTERNAL_tool_NAME)$(EXEEXT) after-$(TARGET)-all
|
||||
|
||||
$(GNUSTEP_OBJ_DIR)/$(INTERNAL_tool_NAME)$(EXEEXT): $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES)
|
||||
$(LD) $(ALL_LDFLAGS) $(LDOUT)$@ \
|
||||
$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ \
|
||||
$(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) \
|
||||
$(ALL_LIB_DIRS) $(ALL_TOOL_LIBS)
|
||||
|
||||
|
|
Loading…
Reference in a new issue