Fix flags handling for autogsdoc

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@14250 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2002-08-08 14:15:08 +00:00
parent b56c635dc7
commit 044ca0786e
2 changed files with 11 additions and 6 deletions

View file

@ -1,3 +1,8 @@
2002-08-08 Richard Frith-Macdonald <rfm@gnu.org>
* Instance/documentation.make: Order autogsdoc flags so that those
from the user makefiles override the default values we supply.
2002-08-01 Adam Fedor <fedor@gnu.org>
* target.make (Darwin): Don't add flags if using

View file

@ -159,14 +159,14 @@ ifeq ($(GNUSTEP_BASE_HAVE_LIBXML), 1)
ifeq ($(AGSDOC_EXPERIMENTAL), 1)
INTERNAL_AGSDOCFLAGS = $(AGSDOC_FLAGS)
INTERNAL_AGSDOCFLAGS += -IgnoreDependencies YES
INTERNAL_AGSDOCFLAGS = -IgnoreDependencies YES
INTERNAL_AGSDOCFLAGS += -Project $(GNUSTEP_INSTANCE)
INTERNAL_AGSDOCFLAGS += -DocumentationDirectory $(GNUSTEP_INSTANCE)
INTERNAL_AGSDOCFLAGS += $(AGSDOC_FLAGS)
INTERNAL_AGSLINKFLAGS = $(AGSLINK_FLAGS)
INTERNAL_AGSLINKFLAGS += -Project $(GNUSTEP_INSTANCE)
INTERNAL_AGSLINKFLAGS = -Project $(GNUSTEP_INSTANCE)
INTERNAL_AGSLINKFLAGS += -DocumentationDirectory $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE)
INTERNAL_AGSLINKFLAGS += $(AGSLINK_FLAGS)
AGSDOC_OBJS = $(patsubst %.gsdoc,%.html,\
$(patsubst %.h,%.html,\
@ -206,9 +206,9 @@ else
# Stable/working rules
#
INTERNAL_AGSDOCFLAGS = $(AGSDOC_FLAGS)
INTERNAL_AGSDOCFLAGS += -Project $(GNUSTEP_INSTANCE)
INTERNAL_AGSDOCFLAGS = -Project $(GNUSTEP_INSTANCE)
INTERNAL_AGSDOCFLAGS += -DocumentationDirectory $(GNUSTEP_INSTANCE)
INTERNAL_AGSDOCFLAGS += $(AGSDOC_FLAGS)
# The autogsdoc program has built-in dependency handling, so we can
# simply run it and it will work out what needs to be rebuilt.