Compile tools on darwin with add=yes

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@15418 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fedor 2002-12-31 03:48:01 +00:00
parent e06dae0f91
commit fd3d03cb58
11 changed files with 34 additions and 4 deletions

View file

@ -1,3 +1,14 @@
2002-12-30 Adam Fedor <fedor@gnu.org>
* SSL/GNUmakefile: Don't compile if base=no
* Tools/AGSIndex.h: Include gnustep/base/GSXML.h.
* Tools/AGSHtml.m: Include GNUstep.h
* Tools/AGSInde.m, Tools/AGSOutput.m, Tools/AGSParser.m,
Tools/HTMLLinker.m: Idem.
* Tools/GNUmakegile: Only compile autogsdoc when add=yes
* Tools/Makefile.preamble: Include -lgnustep-baseadd when add=yes
Mon Dec 30 18:19:55 2002 Nicola Pero <n.pero@mi.flashnet.it> Mon Dec 30 18:19:55 2002 Nicola Pero <n.pero@mi.flashnet.it>
* configure.ac: Recognize apple OBJC_RUNTIME_LIB. * configure.ac: Recognize apple OBJC_RUNTIME_LIB.

View file

@ -36,6 +36,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
srcdir = . srcdir = .
PACKAGE_NAME = gnustep-base PACKAGE_NAME = gnustep-base
ifneq ($(base),no)
ifeq ($(HAVE_OPENSSL), yes) ifeq ($(HAVE_OPENSSL), yes)
# The bundles to be compiled # The bundles to be compiled
@ -52,6 +53,7 @@ SSL_PRINCIPAL_CLASS = GSSSLHandle
SSL_BUNDLE_LIBS = $(SSLLIBS) -lgnustep-base -lobjc SSL_BUNDLE_LIBS = $(SSLLIBS) -lgnustep-base -lobjc
endif
endif endif
# GNUSTEP_INSTALL_PREFIX must be defined here and not in config.h because # GNUSTEP_INSTALL_PREFIX must be defined here and not in config.h because

View file

@ -22,6 +22,7 @@
#include <Foundation/Foundation.h> #include <Foundation/Foundation.h>
#include "AGSHtml.h" #include "AGSHtml.h"
#include "gnustep/base/GNUstep.h"
static int XML_ELEMENT_NODE; static int XML_ELEMENT_NODE;
static int XML_ENTITY_REF_NODE; static int XML_ENTITY_REF_NODE;

View file

@ -22,7 +22,7 @@
*/ */
#include <Foundation/GSXML.h> #include <gnustep/base/GSXML.h>
@interface AGSIndex : NSObject @interface AGSIndex : NSObject
{ {

View file

@ -22,6 +22,7 @@
#include <Foundation/Foundation.h> #include <Foundation/Foundation.h>
#include "AGSIndex.h" #include "AGSIndex.h"
#include "gnustep/base/GNUstep.h"
static int XML_ELEMENT_NODE; static int XML_ELEMENT_NODE;
static int XML_TEXT_NODE; static int XML_TEXT_NODE;

View file

@ -21,6 +21,7 @@
*/ */
#include "AGSOutput.h" #include "AGSOutput.h"
#include "gnustep/base/GNUstep.h"
@interface AGSOutput (Private) @interface AGSOutput (Private)
- (NSString*) mergeMarkup: (NSString*)markup - (NSString*) mergeMarkup: (NSString*)markup

View file

@ -21,6 +21,7 @@
*/ */
#include "AGSParser.h" #include "AGSParser.h"
#include "gnustep/base/GNUstep.h"
@implementation AGSParser @implementation AGSParser

View file

@ -44,13 +44,17 @@ doctemplatesdir = $(GNUSTEP_RESOURCES)/DocTemplates
DOCTEMPLATES_FILES = indextemplate.gsdoc AutoDocTemplate.gsdoc DOCTEMPLATES_FILES = indextemplate.gsdoc AutoDocTemplate.gsdoc
# The application to be compiled # The application to be compiled
TOOL_NAME = autogsdoc cvtenc gdnc gsdoc defaults plmerge \ ifeq ($(add),yes)
TOOL_NAME = autogsdoc
else
TOOL_NAME = autogsdoc cvtenc gdnc defaults plmerge \
plparse sfparse pldes plser pl2link HTMLLinker plparse sfparse pldes plser pl2link HTMLLinker
CTOOL_NAME = gdomap CTOOL_NAME = gdomap
TEST_TOOL_NAME = locale_alias
SUBPROJECTS = make_strings SUBPROJECTS = make_strings
endif
TEST_TOOL_NAME = locale_alias
# The source files to be compiled # The source files to be compiled
autogsdoc_OBJC_FILES = autogsdoc.m AGSParser.m AGSOutput.m AGSIndex.m AGSHtml.m autogsdoc_OBJC_FILES = autogsdoc.m AGSParser.m AGSOutput.m AGSIndex.m AGSHtml.m

View file

@ -22,6 +22,7 @@
*/ */
#include <Foundation/Foundation.h> #include <Foundation/Foundation.h>
#include "gnustep/base/GNUstep.h"
/* For convenience, cached for the whole tool. */ /* For convenience, cached for the whole tool. */

View file

@ -61,3 +61,8 @@ ADDITIONAL_LIB_DIRS += -L../Source/$(GNUSTEP_OBJ_DIR)
# Additional directories to be created during installation # Additional directories to be created during installation
#ADDITIONAL_INSTALL_DIRS += #ADDITIONAL_INSTALL_DIRS +=
ifeq ($(add),yes)
ADDITIONAL_TOOL_LIBS = -lgnustep-baseadd
endif

View file

@ -506,6 +506,7 @@
#include "AGSOutput.h" #include "AGSOutput.h"
#include "AGSIndex.h" #include "AGSIndex.h"
#include "AGSHtml.h" #include "AGSHtml.h"
#include "gnustep/base/GNUstep.h"
int int
main(int argc, char **argv, char **env) main(int argc, char **argv, char **env)
@ -541,7 +542,9 @@ main(int argc, char **argv, char **env)
NSAutoreleasePool *pool = nil; NSAutoreleasePool *pool = nil;
#endif #endif
#ifdef GS_PASS_ARGUMENTS
[NSProcessInfo initializeWithArguments: argv count: argc environment: env]; [NSProcessInfo initializeWithArguments: argv count: argc environment: env];
#endif
#if GS_WITH_GC == 0 #if GS_WITH_GC == 0
outer = [NSAutoreleasePool new]; outer = [NSAutoreleasePool new];