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

Support C++, WindRes and other object files in ctools

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@24323 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2007-01-07 22:01:33 +00:00
parent e9ffa4fdea
commit 71169c1f0c
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2007-01-07 Matt Rice <ratmice@gmail.com>,
Nicola Pero <nicola.pero@meta-innovation.com>
* Instance/ctool.make (internal-ctool-all_): Depend on
OBJ_FILES_TO_LINK, and link OBJ_FILES_TO_LINK. This makes sure
that C++ files, Windres files, and any other object files normally
supported can be used with ctools.
2006-12-28 Richard Frith-Macdonald <rfm@gnu.org>
* Master/source-distribution.make: add 'svn-bugfix' target to make

12
Instance/ctool.make
View file

@ -25,6 +25,13 @@
#
# xxx We need to prefix the target name when cross-compiling
#
# This is the same as a tool, but it is not linked against libobjc and
# it is not linked against the foundation library. This is good if
# you are not using any Objective-C stuff in here.
#
# PS: this means you must leave the variable xxx_OBJC_FILES (and
# xxx_OBJCC_FILES) empty (if you don't, it won't work). If you need
# to compile Objective-C stuff, please use tool.make.
ifeq ($(RULES_MAKE_LOADED),)
include $(GNUSTEP_MAKEFILES)/rules.make
@ -56,10 +63,9 @@ ALL_TOOL_LIBS = \
internal-ctool-all_:: $(GNUSTEP_OBJ_DIR) \
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT)
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT): $(C_OBJ_FILES) \
$(SUBPROJECT_OBJ_FILES)
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT): $(OBJ_FILES_TO_LINK)
$(ECHO_LINKING)$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ \
$(C_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) \
$(OBJ_FILES_TO_LINK) \
$(ALL_TOOL_LIBS)$(END_ECHO)
internal-ctool-install_:: $(CTOOL_INSTALL_DIR)/$(GNUSTEP_TARGET_DIR)