Allow library to be compiled without installing supporting libraries.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@2726 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 1998-02-04 17:46:08 +00:00
parent 8f9aad2c38
commit 9e5d9ef72b
15 changed files with 78 additions and 25 deletions

View file

@ -1,3 +1,35 @@
Wed Feb 4 09:11:49 1998 Adam Fedor <fedor@ultra.doc.com>
* Changes to allow library to be compiled in a GNUstep package
without having previous libraries installed.
* GNUmakefile (GNUSTEP_MAKEFILE_DIR): New variable. Use it to
include makefiles.
(SUBPROJECTS): Remove Testing.
* GNUmakefile.postamble (before-all): Add header-links depend.
(header-links): New target to link in various header dirs.
* Documentation/GNUmakefile (GNUSTEP_MAKEFILE_DIR): New
variable. Use it to include makefiles.
* Images/GNUmakefile: Likewise.
* Model/GNUmakefile: Likewise.
* Testing/GNUmakefile: Likewise.
* Source/GNUmakefile: Likewise.
* Tools/GNUmakefile: Likewise.
* Source/GNUmakefile.postamble (header-links): Removed.
* Model/GNUmakefile (APP_NAME): Comment out.
(ADDITIONAL_INCLUDE_DIRS): New variable.
* Tools/GNUmakefile.preamble (ADDITIONAL_LIB_DIRS): Include Model
lib dir.
(ADDITIONAL_TOOL_LIBS): Include lgmodel, FoundationExt.
* Tools/gpbs.m (initialize_gnustep_backend): New function.
* Headers/gnustep/gui/IMCustomObject.h: Add Appkit/NSView.h.
* Headers/gnuste/NSDPSContext.h: Add stdarg.h
* Model/GMAppKit.m: Update includes.
* Model/IMConnectors.m: Likewise.
* Model/IMCustomObject.m: Likewise.
* Model/IMLoading.m: Likewise.
Thu Jan 29 12:02:08 Ovidiu Predescu <ovidiu@net-community.com>
* Model/IBClasses.h: New class NSCustomView.

View file

@ -27,15 +27,17 @@
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/common.make
GNUSTEP_MAKEFILE_DIR = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
include $(GNUSTEP_MAKEFILE_DIR)/common.make
#
# The list of subproject directories
#
SUBPROJECTS = Model Source Images Tools Testing
SUBPROJECTS = Model Source Images Tools
-include GNUmakefile.preamble
include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/aggregate.make
include $(GNUSTEP_MAKEFILE_DIR)/aggregate.make
-include GNUmakefile.postamble

View file

@ -31,6 +31,7 @@
#define _GNUstep_H_IMCustomObject
#import <Foundation/NSObject.h>
#import <AppKit/NSView.h>
/* Add an archiving category to object so every object can respond to
-nibInstantiate

View file

@ -31,6 +31,7 @@
#include <Foundation/NSObject.h>
#include <AppKit/DPSOperators.h>
#include <stdarg.h>
@class NSData;
@class NSMutableData;

View file

@ -23,7 +23,9 @@
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/common.make
GNUSTEP_MAKEFILE_DIR = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
include $(GNUSTEP_MAKEFILE_DIR)/common.make
include ../Version
@ -58,6 +60,6 @@ nsmapping.strings
# We don't actually build anything in this directory so
# just include the common makefile rules
include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/rules.make
include $(GNUSTEP_MAKEFILE_DIR)/rules.make
-include GNUmakefile.postamble

View file

@ -25,7 +25,7 @@
#import <Foundation/NSArray.h>
#import <Foundation/NSException.h>
#include "GMAppKit.h"
#include "AppKit/GMAppKit.h"
void __dummy_GMAppKit_functionForLinking() {}

View file

@ -24,7 +24,9 @@
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/common.make
GNUSTEP_MAKEFILE_DIR = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
include $(GNUSTEP_MAKEFILE_DIR)/common.make
LIBRARY_NAME = libgmodel
@ -32,7 +34,7 @@ ifeq ($(GUI_LIB), nx)
TOOL_NAME = nib2gmodel
endif
APP_NAME = test
# APP_NAME = test
libgmodel_OBJC_FILES = IMCustomObject.m IMConnectors.m IMLoading.m GMAppKit.m
libgmodel_HEADER_FILES_DIR = .
@ -59,6 +61,9 @@ ADDITIONAL_LIB_DIRS += -L$(GNUSTEP_OBJ_DIR)
ADDITIONAL_TOOL_LIBS += -lgmodel -lFoundationExt
ADDITIONAL_OBJC_FLAGS += $(BACKEND_DEFINE)
# Additional include directories the compiler should search
ADDITIONAL_INCLUDE_DIRS = -I../Headers -I../Headers/gnustep
# What are the libraries this library depends upon. This is needed for some
# systems where building a shared library requires to pass to the linker
# all the libraries the target library depends upon.
@ -68,8 +73,8 @@ LIBRARIES_DEPEND_UPON = -lFoundationExt $(FND_LIBS) $(GUI_LIBS) \
-include GNUmakefile.local
include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/library.make
include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/tool.make
include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/application.make
include $(GNUSTEP_MAKEFILE_DIR)/library.make
include $(GNUSTEP_MAKEFILE_DIR)/tool.make
include $(GNUSTEP_MAKEFILE_DIR)/application.make
-include GNUmakefile.postamble

View file

@ -28,7 +28,7 @@
#import <AppKit/NSActionCell.h>
#include <extensions/GMArchiver.h>
#include <extensions/objc-runtime.h>
#include "IMCustomObject.h"
#include "AppKit/IMCustomObject.h"
#include "IMConnectors.h"
static void

View file

@ -25,7 +25,7 @@
#import <Foundation/NSObjCRuntime.h>
#include <extensions/GMArchiver.h>
#include "IMCustomObject.h"
#include "AppKit/IMCustomObject.h"
@implementation NSObject(ModelUnarchiving)

View file

@ -29,8 +29,8 @@
#import <Foundation/NSPathUtilities.h>
#include <extensions/GMArchiver.h>
#include "IMLoading.h"
#include "IMCustomObject.h"
#include "AppKit/IMLoading.h"
#include "AppKit/IMCustomObject.h"
void __dummy_IMLoading_functionForLinking()
{

View file

@ -26,7 +26,9 @@
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/common.make
GNUSTEP_MAKEFILE_DIR = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
include $(GNUSTEP_MAKEFILE_DIR)/common.make
include ../Version
@ -194,6 +196,6 @@ AppKit/DPSOperators.h
-include GNUmakefile.preamble
include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/library.make
include $(GNUSTEP_MAKEFILE_DIR)/library.make
-include GNUmakefile.postamble

View file

@ -36,7 +36,7 @@
#
# Things to do before compiling
before-all:: header-links
# before-all::
# Things to do after compiling
# after-all::
@ -74,6 +74,3 @@ before-all:: header-links
#
# GNUstep GUI Library specific targets
#
header-links:
-rm -rf ../Headers/AppKit
$(LN_S) ../Headers/gnustep/gui ../Headers/AppKit

View file

@ -25,7 +25,9 @@
# If not, write to the Free Software Foundation,
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/common.make
GNUSTEP_MAKEFILE_DIR = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
include $(GNUSTEP_MAKEFILE_DIR)/common.make
# The application to be compiled
TEST_TOOL_NAME = testpb
@ -35,6 +37,6 @@ testpb_OBJC_FILES = testpb.m
-include GNUmakefile.preamble
include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/test-tool.make
include $(GNUSTEP_MAKEFILE_DIR)/test-tool.make
-include GNUmakefile.postamble

View file

@ -27,7 +27,9 @@
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/common.make
GNUSTEP_MAKEFILE_DIR = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
include $(GNUSTEP_MAKEFILE_DIR)/common.make
# The application to be compiled
TOOL_NAME = gpbs
@ -37,6 +39,6 @@ gpbs_OBJC_FILES = gpbs.m
-include GNUmakefile.preamble
include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/tool.make
include $(GNUSTEP_MAKEFILE_DIR)/tool.make
-include GNUmakefile.postamble

View file

@ -50,6 +50,13 @@
#include <signal.h>
BOOL
initialize_gnustep_backend(void)
{
/* Dummy replacement for the xdps function */
return YES;
}
@class PasteboardServer;
int debug = 0;