mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
* Instance/Documentation/latex.make: Add correct extension to target.
Filter out 'no' when getting LATEX2HMTL exec. * Instance/pallette.make: Link with all libs even on darwin. * target.make (darwin): Use gnu runtime as test for gnu compilation. (Based on suggestions from Yves de Champlain). git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@24608 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
1c0cfbb7b3
commit
3ee9acedac
4 changed files with 15 additions and 7 deletions
|
@ -1,3 +1,11 @@
|
|||
2007-02-16 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* Instance/Documentation/latex.make: Add correct extension to target.
|
||||
Filter out 'no' when getting LATEX2HMTL exec.
|
||||
* Instance/pallette.make: Link with all libs even on darwin.
|
||||
* target.make (darwin): Use gnu runtime as test for gnu compilation.
|
||||
(Based on suggestions from Yves de Champlain).
|
||||
|
||||
2007-02-16 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
Renamed --with-layout=linux option to --with-layout=fhs.
|
||||
|
|
|
@ -65,7 +65,7 @@ internal-doc-clean::
|
|||
# Targets built only if we can find `latex2html'
|
||||
#
|
||||
# NB: you may set LATEX2HTML on the command line if the following doesn't work
|
||||
LATEX2HTML = $(shell which latex2html | awk '{print $$1}' | sed -e 's/which://')
|
||||
LATEX2HTML = $(shell which latex2html | awk '{print $$1}' | sed -e 's/no//')
|
||||
|
||||
ifneq ($(LATEX2HTML),)
|
||||
HAS_LATEX2HTML = yes
|
||||
|
@ -75,7 +75,7 @@ ifeq ($(HAS_LATEX2HTML),yes)
|
|||
internal-doc-all_:: $(GNUSTEP_INSTANCE).tar.gz
|
||||
|
||||
$(GNUSTEP_INSTANCE)/$(GNUSTEP_INSTANCE).html: $(GNUSTEP_INSTANCE).dvi
|
||||
$(LATEX2HTML) $(GNUSTEP_INSTANCE)
|
||||
$(LATEX2HTML) $(GNUSTEP_INSTANCE).dvi
|
||||
|
||||
$(GNUSTEP_INSTANCE).tar.gz: $(GNUSTEP_INSTANCE)/$(GNUSTEP_INSTANCE).html
|
||||
$(TAR) cfzX $(GNUSTEP_INSTANCE).tar.gz $(GNUSTEP_MAKEFILES)/tar-exclude-list $(GNUSTEP_INSTANCE)
|
||||
|
|
|
@ -49,8 +49,8 @@ ifeq ($(BUILD_DLL), yes)
|
|||
endif
|
||||
|
||||
# On Apple, two-level namespaces require all symbols in bundles
|
||||
# to be resolved at link time.
|
||||
ifeq ($(FOUNDATION_LIB), apple)
|
||||
# to be resolved at link time. Also on gnu/darwin
|
||||
ifeq ($(CC_BUNDLE), yes)
|
||||
LINK_PALETTE_AGAINST_ALL_LIBS = yes
|
||||
endif
|
||||
|
||||
|
|
|
@ -296,7 +296,7 @@ ifeq ($(FOUNDATION_LIB), apple)
|
|||
DYLIB_DEF_FRAMEWORKS += -framework Foundation
|
||||
endif
|
||||
|
||||
ifeq ($(CC_BUNDLE), no)
|
||||
ifeq ($(OBJC_RUNTIME_LIB), gnu)
|
||||
# GNU compiler
|
||||
|
||||
INTERNAL_LDFLAGS += -flat_namespace -undefined warning
|
||||
|
@ -330,8 +330,8 @@ SHARED_LIB_LINK_CMD = \
|
|||
fi; \
|
||||
$(LN_S) $(LIB_LINK_VERSION_FILE) $(LIB_LINK_FILE))
|
||||
|
||||
BUNDLE_LD = /usr/bin/ld
|
||||
BUNDLE_LDFLAGS += -bundle /usr/lib/bundle1.o
|
||||
BUNDLE_LD = $(CC)
|
||||
BUNDLE_LDFLAGS += -fgnu-runtime -bundle
|
||||
|
||||
else
|
||||
# Apple Compiler
|
||||
|
|
Loading…
Reference in a new issue