From aa5354e63f0ec53e838ea53348ca1a17bfd083b4 Mon Sep 17 00:00:00 2001 From: Scott Christley Date: Tue, 23 Sep 1997 21:00:33 +0000 Subject: [PATCH] Convert to the GNUstep makefile package. The installation of the header files was modified slightly to correspond with the GNUstep makefile package. All OpenStep headers go into Foundation while the gnustep-base specific headers go into gnustep/base. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@2437 72102866-910b-0410-8b05-ffd578937521 --- Makeconf => Admin/Makefile | 34 +- Admin/Makefile.in | 63 -- Admin/Makefile.postamble | 83 ++ ChangeLog | 41 + Examples/Makefile | 63 ++ Examples/Makefile.in | 127 --- Examples/Makefile.preamble | 61 ++ Headers/gnustep/base/Connection.h | 2 +- Headers/gnustep/base/NSConnection.h | 2 +- Headers/gnustep/base/NSPortCoder.h | 2 +- Headers/gnustep/base/Notification.h | 2 +- Headers/gnustep/base/NotificationDispatcher.h | 2 +- Makefile | 52 ++ Makefile.in | 136 --- Makefile.postamble | 113 +++ Makefile.sed.nt | 18 - NSCharacterSets/{Makefile.in => Makefile} | 57 +- NSCharacterSets/Makefile.postamble | 83 ++ Source/Makefile | 494 +++++++++++ Source/Makefile.in | 826 ------------------ Source/Makefile.postamble | 204 +++++ Source/Makefile.preamble | 68 ++ Testing/Makefile.preamble | 61 ++ Testing/coder.m | 2 +- Testing/cstream.m | 2 +- Testing/oldserver.m | 2 +- Testing/string.m | 2 +- config.mak.in | 4 + configure.in | 3 +- 29 files changed, 1371 insertions(+), 1238 deletions(-) rename Makeconf => Admin/Makefile (57%) delete mode 100644 Admin/Makefile.in create mode 100644 Admin/Makefile.postamble create mode 100644 Examples/Makefile delete mode 100644 Examples/Makefile.in create mode 100644 Examples/Makefile.preamble create mode 100644 Makefile delete mode 100644 Makefile.in create mode 100644 Makefile.postamble delete mode 100644 Makefile.sed.nt rename NSCharacterSets/{Makefile.in => Makefile} (51%) create mode 100644 NSCharacterSets/Makefile.postamble create mode 100644 Source/Makefile delete mode 100644 Source/Makefile.in create mode 100644 Source/Makefile.postamble create mode 100644 Source/Makefile.preamble create mode 100644 Testing/Makefile.preamble create mode 100644 config.mak.in diff --git a/Makeconf b/Admin/Makefile similarity index 57% rename from Makeconf rename to Admin/Makefile index 0531c4315..9cdea6e60 100644 --- a/Makeconf +++ b/Admin/Makefile @@ -1,10 +1,10 @@ - -# Makefile definitions for inclusion in all subdir Makefiles -# Copyright (C) 1995, 1996 Free Software Foundation, Inc. +# +# admin makefile for the GNUstep Base Library +# Copyright (C) 1995 Free Software Foundation, Inc. # # Written by: Andrew Kachites McCallum # -# This file is part of the GNU Objective-C Class library. +# This file is part of the GNUstep Base Library. # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Library General Public @@ -20,14 +20,24 @@ # License along with this library; if not, write to the Free # Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/common.make -# Put this first so it's the default -all: +include ../Version +include ../config.mak -# Default to empty; individual Makefile's can override this -install: -uninstall: +ADMIN_FILES = \ +HOWTO-patches \ +example.patch \ +volunteers \ +tasks -PACKAGE_NAME = gstep-base -LIBRARY_NAME = gnustep-base -LIBRARY_VAR = GNUSTEP_BASE +RCS_FILES = Makefile +DIST_FILES = $(RCS_FILES) $(ADMIN_FILES) + +-include Makefile.preamble + +# We don't actually build anything in this directory so +# just include the common makefile rules +include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/rules.make + +-include Makefile.postamble diff --git a/Admin/Makefile.in b/Admin/Makefile.in deleted file mode 100644 index 9e1edd57f..000000000 --- a/Admin/Makefile.in +++ /dev/null @@ -1,63 +0,0 @@ -# -# admin makefile for Objective-C Class Library -# Copyright (C) 1995 Free Software Foundation, Inc. -# -# Written by: Andrew Kachites McCallum -# -# This file is part of the Gnustep Base Library. -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Library General Public -# License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Library General Public License for more details. -# -# You should have received a copy of the GNU Library General Public -# License along with this library; if not, write to the Free -# Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -SHELL = /bin/sh - -#### Start of system configuration section. #### - -srcdir = @srcdir@ -VPATH = @srcdir@ - -#### End of system configuration section. #### - -include $(srcdir)/../Makeconf - -ADMIN_FILES = \ -HOWTO-patches \ -example.patch \ -volunteers \ -tasks - -RCS_FILES = Makefile.in -DIST_FILES = $(RCS_FILES) $(ADMIN_FILES) - -Makefile: $(srcdir)/Makefile.in ../config.status - cd ..; $(SHELL) config.status -../config.status: - cd ..; $(SHELL) configure --no-create -tasks: ../doc/todo.texi - rm -f tasks - (cd ../doc; $(MAKE) -$(MAKEFLAGS) $(MAKEDEFINES) TODO) - cp ../doc/TODO ./tasks - -mostlyclean: - rm -f *~ -clean: mostlyclean -distclean: clean - rm -f Makefile -maintainer-clean: distclean - -copy-dist: $(DIST_FILES) - mkdir $(srcdir)/../snap/admin - for f in $(DIST_FILES); do \ - cp $$f $(srcdir)/../snap/admin ; \ - done diff --git a/Admin/Makefile.postamble b/Admin/Makefile.postamble new file mode 100644 index 000000000..3a340c0bf --- /dev/null +++ b/Admin/Makefile.postamble @@ -0,0 +1,83 @@ +# +# Makefile.postamble +# +# Copyright (C) 1997 Free Software Foundation, Inc. +# +# Author: Scott Christley +# +# This file is part of the GNUstep Base Library. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# If you are interested in a warranty or support for this source code, +# contact Scott Christley at scottc@net-community.com +# +# You should have received a copy of the GNU Library General Public +# License along with this library; see the file COPYING.LIB. +# If not, write to the Free Software Foundation, +# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +# +# Makefile.postamble +# +# Project specific makefile rules +# +# Uncomment the targets you want. +# The double colons (::) are important, do not make them single colons +# otherwise the normal makefile rules will not be performed. +# + +# Things to do before compiling +# before-all:: + +# Things to do after compiling +# after-all:: + +# Things to do before installing +# before-install:: + +# Things to do after installing +# after-install:: + +# Things to do before uninstalling +# before-uninstall:: + +# Things to do after uninstalling +# after-uninstall:: + +# Things to do before cleaning +# before-clean:: + +# Things to do after cleaning +# after-clean:: + +# Things to do before distcleaning +# before-distclean:: + +# Things to do after distcleaning +# after-distclean:: + +# Things to do before checking +# before-check:: + +# Things to do after checking +# after-check:: + +tasks: ../doc/todo.texi + rm -f tasks + (cd ../doc; $(MAKE) -$(MAKEFLAGS) $(MAKEDEFINES) TODO) + cp ../doc/TODO ./tasks + +copy-dist: $(DIST_FILES) + mkdir $(srcdir)/../snap/admin + for f in $(DIST_FILES); do \ + cp $$f $(srcdir)/../snap/admin ; \ + done diff --git a/ChangeLog b/ChangeLog index ca36acf3e..22efed6e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,44 @@ +Sat Sep 23 10:18:41 2017 Scott Christley + + * Convert to GNUstep makefile package. + * Makefile: New file. + * Makefile.postamble: New file. + * config.mak.in: New file. + * Makefile.in: Delete. + * Makefile.sed.nt: Delete. + * Makeconf: Delete. + * configure.in (AC_OUTPUT): No longer create the makefiles. + * NSCharacterSets/Makefile: New file. + * NSCharacterSets/Makefile.postamble: New file. + * NSCharacterSets/Makefile.in: Delete. + * admin/Makefile: New file. + * admin/Makefile.postamble: New file. + * admin/Makefile.in: Delete + * checks/Makefile: New file. + * checks/Makefile.preamble: New file. + * checks/Makefile.in: Delete. + * examples/Makefile: New file. + * examples/Makefile.preamble: New file. + * examples/Makefile.in: Delete. + * src/Makefile: New file. + * src/Makefile.preamble: New file. + * src/Makefile.postamble: New file. + * src/Makefile.in: Delete + + * The installation of the header files was modified slightly + to correspond with the GNUstep makefile package. All OpenStep + headers go into Foundation while the gnustep-base specific + headers go into gnustep/base. + * checks/coder.m: Correct header directory. + * checks/cstream.m: Likewise. + * checks/oldserver.m: Likewise. + * checks/string.m: Likewise. + * src/include/Connection.h: Likewise. + * src/include/NSConnection.h: Likewise. + * src/include/NSPortCoder.h: Likewise. + * src/include/Notification.h: Likewise. + * src/include/NotificationDispatcher.h: Likewise. + Mon Sep 22 17:14:32 1997 Adam Fedor * checks/NSData-test.m: Change main to return int. diff --git a/Examples/Makefile b/Examples/Makefile new file mode 100644 index 000000000..870a126c3 --- /dev/null +++ b/Examples/Makefile @@ -0,0 +1,63 @@ +# +# examples makefile for the GNUstep Base Library +# +# Copyright (C) 1997 Free Software Foundation, Inc. +# +# Written by: Scott Christley +# +# This file is part of the GNUstep Base Library. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this library; if not, write to the Free +# Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# + +include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/common.make + +include ../Version +include ../config.mak + +# The tools to be compiled +TOOL_NAME = \ +dictionary \ +stdio-stream \ +textcoding \ +first-server \ +first-client \ +second-server \ +second-client + +# The Objective-C source files to be compiled +dictionary_OBJC_FILES = dictionary.m +stdio-stream_OBJC_FILES = stdio-stream.m +textcoding_OBJC_FILES = textcoding.m +first-server_OBJC_FILES = first-server.m +first-client_OBJC_FILES = first-client.m +second-server_OBJC_FILES = second-server.m +second-client_OBJC_FILES = second-client.m + +HDRS = \ +first-server.h \ +second-server.h \ +second-client.h + +RCS_FILES = $(SRCS) $(HDRS) Makefile \ +Makefile.example.in \ +configure.example.in \ +custom-zone.m + +-include Makefile.preamble + +include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/tool.make + +-include Makefile.postamble diff --git a/Examples/Makefile.in b/Examples/Makefile.in deleted file mode 100644 index f044810c8..000000000 --- a/Examples/Makefile.in +++ /dev/null @@ -1,127 +0,0 @@ -# -# Examples makefile for Objective-C Class Library -# Copyright (C) 1993, 1995, 1996, 1997 Free Software Foundation, Inc. -# -# Written by: Andrew Kachites McCallum -# Dept. of Computer Science, U. of Rochester, Rochester, NY 14627 -# -# This file is part of the GNU Objective-C Class Library. -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Library General Public -# License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Library General Public License for more details. -# -# You should have received a copy of the GNU Library General Public -# License along with this library; if not, write to the Free -# Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -SHELL = /bin/sh - -#### Start of system configuration section. #### - -srcdir = @srcdir@ -VPATH = @srcdir@ - -CC = @CC@ - -CFLAGS = -Wall -Wno-implicit -Wno-format -g -O -CPPFLAGS = -LDFLAGS = - -DEFS = @DEFS@ -LIBS = -L../src @whole_archive@ -l$(LIBRARY_NAME) @no_whole_archive@ @LIBOBJC@ @LIBS@ -lm - -EXEEXT = -OEXT = .o -LIBEXT = .a - -#### End of system configuration section. #### - -include $(srcdir)/../Makeconf -include $(srcdir)/../Version - -# xxx Is this needed anymore? -NEXT_NEXT_INCLUDES = -I/usr/include -GNU_NEXT_INCLUDES = -I$(srcdir)/../src -NEXT_INCLUDES = @NEXT_INCLUDES@ - -ALL_CPPFLAGS = -I../src -I$../src/srcdir-include $(NEXT_INCLUDES) $(CPPFLAGS) -ALL_CFLAGS = $(CFLAGS) -ALL_OBJCFLAGS = $(CFLAGS) -Wno-protocol -ALL_LDFLAGS = $(LDFLAGS) $(LIBS) - -.SUFFIXES: .m -.m.o: - $(CC) -c $(ALL_CPPFLAGS) $(DEFS) $(ALL_OBJCFLAGS) $< -o $*.o -.c.o: - $(CC) -c $(ALL_CPPFLAGS) $(DEFS) $(ALL_CFLAGS) $< -o $*.o - -SRCS = \ -dictionary.m \ -stdio-stream.m \ -textcoding.m \ -first-server.m \ -first-client.m \ -second-server.m \ -second-client.m - -HDRS = \ -first-server.h \ -second-server.h \ -second-client.h - -EXCS = $(SRCS:.m=) - -all: $(EXCS) - -# This works for GNU make, but not others. -%: %$(OEXT) $(srcdir)/../src/lib$(LIBRARY_NAME)$(LIBEXT) - $(CC) $(ALL_CFLAGS) $@$(OEXT) -o $@ $(ALL_LDFLAGS) - -../src/lib$(LIBRARY_NAME)$(LIBEXT): - @echo You must first make the library $(LIBRARY_NAME). - @false - -first: FORCE - (cd ../src; $(MAKE)) - $(MAKE) first-server first-client -second: FORCE - (cd ../src; $(MAKE)) - $(MAKE) second-server second-client - -install: -uninstall: - -RCS_FILES = $(SRCS) $(HDRS) Makefile.in \ -Makefile.example.in \ -configure.example.in \ -custom-zone.m - -DIST_FILES = $(RCS_FILES) - -mostlyclean: - rm -f core *~ - -clean: mostlyclean - rm -f *.o $(EXCS) - -distclean: clean - rm -f Makefile config.status - -maintainer-clean: distclean - rm -f TAGS - -copy-dist: $(DIST_FILES) - mkdir ../snap/examples - ln $(DIST_FILES) ../snap/examples - -Makefile: $(srcdir)/Makefile.in - cd ..; $(SHELL) config.status - -FORCE: diff --git a/Examples/Makefile.preamble b/Examples/Makefile.preamble new file mode 100644 index 000000000..345031f01 --- /dev/null +++ b/Examples/Makefile.preamble @@ -0,0 +1,61 @@ +# +# examples makefile for the GNUstep Base Library +# +# Copyright (C) 1997 Free Software Foundation, Inc. +# +# Written by: Scott Christley +# +# This file is part of the GNUstep Base Library. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this library; if not, write to the Free +# Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# + +# +# Makefile.preamble +# +# Project specific makefile variables, and additional +# +# Do not put any Makefile rules in this file, instead they should +# be put into Makefile.postamble. +# + +# +# Flags dealing with compiling and linking +# + +# Additional flags to pass to the preprocessor +ADDITIONAL_CPPFLAGS = + +# Additional flags to pass to the Objective-C compiler +ADDITIONAL_OBJCFLAGS = + +# Additional flags to pass to the C compiler +ADDITIONAL_CFLAGS = + +# Additional include directories the compiler should search +ADDITIONAL_INCLUDE_DIRS = -I../src -I../src/srcdir-include + +# Additional LDFLAGS to pass to the linker +ADDITIONAL_LDFLAGS = + +# Additional library directories the linker should search +ADDITIONAL_LIB_DIRS = -L../src/$(GNUSTEP_OBJ_DIR) + +# +# Flags dealing with installing and uninstalling +# + +# Additional directories to be created during installation +ADDITIONAL_INSTALL_DIRS = diff --git a/Headers/gnustep/base/Connection.h b/Headers/gnustep/base/Connection.h index 36ab67f79..75eb848d7 100644 --- a/Headers/gnustep/base/Connection.h +++ b/Headers/gnustep/base/Connection.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include @class Proxy; diff --git a/Headers/gnustep/base/NSConnection.h b/Headers/gnustep/base/NSConnection.h index 598eec059..276b4cda5 100644 --- a/Headers/gnustep/base/NSConnection.h +++ b/Headers/gnustep/base/NSConnection.h @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Headers/gnustep/base/NSPortCoder.h b/Headers/gnustep/base/NSPortCoder.h index 242e21b25..273566ed7 100644 --- a/Headers/gnustep/base/NSPortCoder.h +++ b/Headers/gnustep/base/NSPortCoder.h @@ -25,7 +25,7 @@ #define __NSPortCoder_h #include -#include +#include #include #include diff --git a/Headers/gnustep/base/Notification.h b/Headers/gnustep/base/Notification.h index 11c2e452c..de559da5a 100644 --- a/Headers/gnustep/base/Notification.h +++ b/Headers/gnustep/base/Notification.h @@ -25,7 +25,7 @@ #define __Notification_h_GNUSTEP_BASE_INCLUDE #include -#include +#include #include #include diff --git a/Headers/gnustep/base/NotificationDispatcher.h b/Headers/gnustep/base/NotificationDispatcher.h index d4fc8dbbe..ebf3c6809 100644 --- a/Headers/gnustep/base/NotificationDispatcher.h +++ b/Headers/gnustep/base/NotificationDispatcher.h @@ -60,7 +60,7 @@ #include #include #include -#include +#include #include @interface NotificationDispatcher : NSObject diff --git a/Makefile b/Makefile new file mode 100644 index 000000000..84bf96fe2 --- /dev/null +++ b/Makefile @@ -0,0 +1,52 @@ +# +# Main Makefile for GNUstep Base Library. +# +# Copyright (C) 1997 Free Software Foundation, Inc. +# +# Written by: Scott Christley +# +# This file is part of the GNUstep Base Library. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this library; if not, write to the Free +# Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# + +include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/common.make + +include ./Version + +DIST_FILES = \ + Makefile.in Makeconf configure.in aclocal.m4 acconfig.h \ + configure.bat Makefile.sed.nt INSTALL.WIN32 \ + config/config.nested.c config/config.nextcc.h config/config.nextrt.m \ + config/config.vsprintf.c \ + README.ULTRIX README.foundation README.ucblib \ + STATUS RELEASE-NOTES \ + COPYING COPYING.LIB ChangeLog \ + configure Version \ + config.guess mkinstalldirs install-sh config.sub \ + NSBundle.README \ + gcc-2.7.2-objc.diff \ + gcc-2.7.2.1-objc.diff + +# +# The list of subproject directories +# +SUBPROJECTS = src doc checks examples NSCharacterSets admin + +-include Makefile.preamble + +include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/aggregate.make + +-include Makefile.postamble diff --git a/Makefile.in b/Makefile.in deleted file mode 100644 index 79d719e8b..000000000 --- a/Makefile.in +++ /dev/null @@ -1,136 +0,0 @@ -# @configure_input@ -# Main Makefile for GNUstep Base Library. -# -# Copyright (C) 1993,1994,1995, 1996, 1997 Free Software Foundation, Inc. -# -# Written by: Andrew Kachites McCallum -# -# This file is part of the GNUstep Base Library. -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Library General Public -# License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Library General Public License for more details. -# -# You should have received a copy of the GNU Library General Public -# License along with this library; if not, write to the Free -# Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - -SHELL = /bin/sh - -#### Start of system configuration section. #### - -srcdir = @srcdir@ -VPATH = @srcdir@ - -MAKEDEFINES = - -#### End of system configuration section. #### - -include $(srcdir)/Makeconf -include $(srcdir)/Version - -SUBDIRS = src doc checks examples NSCharacterSets admin - -RCS_FILES = - -DIST_FILES = \ - Makefile.in Makeconf configure.in aclocal.m4 acconfig.h \ - configure.bat Makefile.sed.nt INSTALL.WIN32 \ - config/config.nested.c config/config.nextcc.h config/config.nextrt.m \ - config/config.vsprintf.c \ - README.ULTRIX README.foundation README.ucblib \ - STATUS RELEASE-NOTES \ - COPYING COPYING.LIB ChangeLog \ - configure Version \ - config.guess mkinstalldirs install-sh config.sub \ - NSBundle.README \ - gcc-2.7.2-objc.diff \ - gcc-2.7.2.1-objc.diff - -all: src - -%-subdirs: - for i in $(SUBDIRS); do \ - (cd $$i; $(MAKE) $(MAKEDEFINES) $*); \ - done - -src doc checks examples: FORCE - cd $@; $(MAKE) $(MAKEDEFINES) - -install uninstall TAGS: FORCE - for i in $(SUBDIRS); do \ - (cd $$i; $(MAKE) $(MAKEDEFINES) $@); \ - done - -info dvi: FORCE - cd doc; $(MAKE) $(MAKEDEFINES) $@ - -check: FORCE - cd checks; $(MAKE) $(MAKEDEFINES) - -Makefile: Makefile.in config.status - $(SHELL) config.status -config.status: configure - $(SHELL) $(srcdir)/configure --no-create -configure: configure.in - cd $(srcdir); autoconf - -mostlyclean-top: - rm -f *~ -clean-top: -distclean-top: - rm -f Makefile config.status config.log config.cache TAGS -maintainer-clean-top: - -mostlyclean: mostlyclean-subdirs mostlyclean-top -clean: clean-subdirs clean-top -distclean: distclean-subdirs distclean-top -maintainer-clean: maintainer-clean-subdirs maintainer-clean-top - -snap: $(DIST_FILES) - rm -rf snap - mkdir snap - for i in $(SUBDIRS); do \ - (cd $$i; $(MAKE) $(MAKEDEFINES) copy-dist); \ - done - mkdir snap/config - for file in $(DIST_FILES); do \ - ln $$file snap/$$file ; \ - done - -snapshot: snap - ln README.first snap - rm -f .name - echo $(PACKAGE_NAME)-`date +%y%m%d` >.name - rm -rf `cat .name` - mv snap `cat .name` - tar -chvf `cat .name`.tar `cat .name` - rm -f `cat .name`.tar.gz - gzip -9 `cat .name`.tar - rm -rf `cat .name` - -dist: snap - mv snap $(PACKAGE_NAME)-$(VERSION) - tar -chvf $(PACKAGE_NAME)-$(VERSION).tar \ - $(PACKAGE_NAME)-$(VERSION) - rm -f $(PACKAGE_NAME)-$(VERSION).tar.gz - gzip -9 $(PACKAGE_NAME)-$(VERSION).tar - rm -rf $(PACKAGE_NAME)-$(VERSION) - -snapshot-rtag: - cvs rtag snapshot-`date +%y%m%d` $(PACKAGE_NAME) - -dist-rtag: - cvs rtag release-`echo $(VERSION) | tr . -` $(PACKAGE_NAME) - -rdiff: - cvs rdiff -u -r $(OLD) $(PACKAGE_NAME) - -FORCE: diff --git a/Makefile.postamble b/Makefile.postamble new file mode 100644 index 000000000..d709ff30a --- /dev/null +++ b/Makefile.postamble @@ -0,0 +1,113 @@ +# +# Makefile.postamble +# +# Copyright (C) 1997 Free Software Foundation, Inc. +# +# Author: Scott Christley +# +# This file is part of the GNUstep Base Library. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# If you are interested in a warranty or support for this source code, +# contact Scott Christley at scottc@net-community.com +# +# You should have received a copy of the GNU Library General Public +# License along with this library; see the file COPYING.LIB. +# If not, write to the Free Software Foundation, +# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +# +# Makefile.postamble +# +# Project specific makefile rules +# +# Uncomment the targets you want. +# The double colons (::) are important, do not make them single colons +# otherwise the normal makefile rules will not be performed. +# + +# Things to do before compiling +# before-all:: + +# Things to do after compiling +# after-all:: + +# Things to do before installing +# before-install:: + +# Things to do after installing +# after-install:: + +# Things to do before uninstalling +# before-uninstall:: + +# Things to do after uninstalling +# after-uninstall:: + +# Things to do before cleaning +# before-clean:: + +# Things to do after cleaning +# after-clean:: + +# Things to do before distcleaning +# before-distclean:: + +# Things to do after distcleaning +after-distclean:: + rm -f config.status config.log config.cache TAGS config.mak + +# Things to do before checking +# before-check:: + +# Things to do after checking +# after-check:: + + +snap: $(DIST_FILES) + rm -rf snap + mkdir snap + for i in $(SUBDIRS); do \ + (cd $$i; $(MAKE) $(MAKEDEFINES) copy-dist); \ + done + mkdir snap/config + for file in $(DIST_FILES); do \ + ln $$file snap/$$file ; \ + done + +snapshot: snap + ln README.first snap + rm -f .name + echo $(PACKAGE_NAME)-`date +%y%m%d` >.name + rm -rf `cat .name` + mv snap `cat .name` + tar -chvf `cat .name`.tar `cat .name` + rm -f `cat .name`.tar.gz + gzip -9 `cat .name`.tar + rm -rf `cat .name` + +dist: snap + mv snap $(PACKAGE_NAME)-$(VERSION) + tar -chvf $(PACKAGE_NAME)-$(VERSION).tar \ + $(PACKAGE_NAME)-$(VERSION) + rm -f $(PACKAGE_NAME)-$(VERSION).tar.gz + gzip -9 $(PACKAGE_NAME)-$(VERSION).tar + rm -rf $(PACKAGE_NAME)-$(VERSION) + +snapshot-rtag: + cvs rtag snapshot-`date +%y%m%d` $(PACKAGE_NAME) + +dist-rtag: + cvs rtag release-`echo $(VERSION) | tr . -` $(PACKAGE_NAME) + +rdiff: + cvs rdiff -u -r $(OLD) $(PACKAGE_NAME) diff --git a/Makefile.sed.nt b/Makefile.sed.nt deleted file mode 100644 index 099e253e3..000000000 --- a/Makefile.sed.nt +++ /dev/null @@ -1,18 +0,0 @@ -s/@configure_input@/ Generated from Makefile.in by configure.bat/ -s/@srcdir@/./ -/%-subdirs:/,/done/c\ -%-subdirs: \ - for %i in ( $(SUBDIRS) ) do \\\ - ( cd %i & \\\ - $(MAKE) - $(MAKEFLAGS) $(MAKEDEFINES) $* & \\\ - cd .. ) -/install uninstall TAGS:/,/done/c\ -install uninstall TAGS: FORCE\ - for %i in ( $(SUBDIRS) ) do \\\ - ( cd %i & \\\ - $(MAKE) - $(MAKEFLAGS) $(MAKEDEFINES) $@ & \\\ - cd .. ) -/src doc checks examples:/,/$(MAKEDEFINES)/c\ -src doc checks examples: FORCE \ - cd $@ & $(MAKE) $(MAKEDEFINES) - diff --git a/NSCharacterSets/Makefile.in b/NSCharacterSets/Makefile similarity index 51% rename from NSCharacterSets/Makefile.in rename to NSCharacterSets/Makefile index 1a57e0ce2..0444ad1f4 100644 --- a/NSCharacterSets/Makefile.in +++ b/NSCharacterSets/Makefile @@ -1,10 +1,10 @@ # -# NSCharacterSet makefile for Objective-C Class Library +# NSCharacterSet makefile for GNUstep Base Library # Copyright (C) 1995, 1996 Free Software Foundation, Inc. # # Written by: Andrew Kachites McCallum # -# This file is part of the Gnustep Base Library. +# This file is part of the GNUstep Base Library. # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Library General Public @@ -20,28 +20,12 @@ # License along with this library; if not, write to the Free # Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -SHELL = /bin/sh +include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/common.make -#### Start of system configuration section. #### +include ../Version +include ../config.mak -srcdir = @srcdir@ -VPATH = @srcdir@ - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -libdir = @libdir@ -gnustep_libdir = $(libdir)/gnustep -charsetdir = $(gnustep_libdir)/NSCharacterSets - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ - -#### End of system configuration section. #### - -include $(srcdir)/../Makeconf - -all: +charsetdir = $(GNUSTEP_RESOURCES)/gnustep/NSCharacterSets CHARSET_FILES = \ alphanumCharSet.dat \ @@ -55,31 +39,14 @@ uppercaseCharSet.dat \ whitespaceCharSet.dat \ whitespaceandnlCharSet.dat -RCS_FILES = Makefile.in +RCS_FILES = Makefile DIST_FILES = $(RCS_FILES) $(CHARSET_FILES) README.CharSet INSTALL_FILES = $(CHARSET_FILES) README.CharSet -installdirs: - $(srcdir)/../mkinstalldirs $(libdir) $(gnustep_libdir) $(charsetdir) -install: installdirs - for file in $(INSTALL_FILES); do \ - $(INSTALL_DATA) $(srcdir)/$$file $(charsetdir)/$$file ; \ - done -uninstall: - for file in $(INSTALL_FILES); do \ - rm -f $(charsetdir)/$$file ; \ - done +-include Makefile.preamble -mostlyclean: - rm -f *~ -clean: mostlyclean -distclean: clean - rm -f Makefile -maintainer-clean: distclean +# We don't actually build anything in this directory so +# just include the common makefile rules +include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/rules.make -copy-dist: $(DIST_FILES) - mkdir $(srcdir)/../snap/NSCharacterSets - ln $(DIST_FILES) $(srcdir)/../snap/NSCharacterSets - -Makefile: $(srcdir)/Makefile.in - cd ..; $(SHELL) config.status +-include Makefile.postamble diff --git a/NSCharacterSets/Makefile.postamble b/NSCharacterSets/Makefile.postamble new file mode 100644 index 000000000..b0550a98e --- /dev/null +++ b/NSCharacterSets/Makefile.postamble @@ -0,0 +1,83 @@ +# +# Makefile.postamble +# +# Copyright (C) 1997 Free Software Foundation, Inc. +# +# Author: Scott Christley +# +# This file is part of the GNUstep Base Library. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# If you are interested in a warranty or support for this source code, +# contact Scott Christley at scottc@net-community.com +# +# You should have received a copy of the GNU Library General Public +# License along with this library; see the file COPYING.LIB. +# If not, write to the Free Software Foundation, +# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +# +# Makefile.postamble +# +# Project specific makefile rules +# +# Uncomment the targets you want. +# The double colons (::) are important, do not make them single colons +# otherwise the normal makefile rules will not be performed. +# + +# Things to do before compiling +# before-all:: + +# Things to do after compiling +# after-all:: + +# Things to do before installing +before-install:: + $(GNUSTEP_MAKEFILES)/mkinstalldirs $(charsetdir) + +# Things to do after installing +after-install:: + for file in $(INSTALL_FILES); do \ + $(INSTALL_DATA) $$file $(charsetdir)/$$file ; \ + done + +# Things to do before uninstalling +# before-uninstall:: + +# Things to do after uninstalling +after-uninstall:: + for file in $(INSTALL_FILES); do \ + rm -f $(charsetdir)/$$file ; \ + done + +# Things to do before cleaning +# before-clean:: + +# Things to do after cleaning +# after-clean:: + +# Things to do before distcleaning +# before-distclean:: + +# Things to do after distcleaning +# after-distclean:: + +# Things to do before checking +# before-check:: + +# Things to do after checking +# after-check:: + +copy-dist: $(DIST_FILES) + mkdir ../snap/NSCharacterSets + ln $(DIST_FILES) ../snap/NSCharacterSets diff --git a/Source/Makefile b/Source/Makefile new file mode 100644 index 000000000..a26e9082f --- /dev/null +++ b/Source/Makefile @@ -0,0 +1,494 @@ +# +# src makefile for the GNUstep Base Library +# +# Copyright (C) 1997 Free Software Foundation, Inc. +# +# Written by: Scott Christley +# +# This file is part of the GNUstep Base Library. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this library; if not, write to the Free +# Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# + +include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/common.make + +include ../Version +include ../config.mak + +srcdir = . +PACKAGE_NAME = gstep-base +LIBRARY_VAR = GNUSTEP_BASE + +# The library to be compiled +LIBRARY_NAME=libgnustep-base + +# GNUSTEP_INSTALL_PREFIX must be defined here and not in config.h because +# the installing person may set it on the `make' command line. +DEFS= -DGNUSTEP_INSTALL_PREFIX=$(GNUSTEP_SYSTEM_ROOT) \ + -DPLATFORM_OS=\"@PLATFORM_OS@\" \ + -DGNUSTEP_INSTALL_LIBDIR=\"$(gnustep_libdir)\" + +# Grep for these names to build the legally-required "AUTHORS" file. +FILE_AUTHORS = \ +"Andrew Kachites McCallum" \ +"Kresten Krab Thorup" \ +"Adam Fedor" \ +"Mark Lakata" \ +"Jeremy Bettis" \ +"Georg Tuparev" \ +"Peter Burka" \ +"Albin L. Jones" \ +"Scott Christley" \ +"Luke Howard" \ +"Yoo C. Chung" \ +"Richard Frith-Macdonald" + +# The GNU source files + +GNU_MFILES = \ +Archiver.m \ +Array.m \ +Bag.m \ +BinaryCStream.m \ +BinaryTree.m \ +BinaryTreeNode.m \ +CircularArray.m \ +Collection.m \ +ConnectedCoder.m \ +Connection.m \ +Coder.m \ +Connection.m \ +CStream.m \ +Decoder.m \ +DelegatePool.m \ +Dictionary.m \ +Encoder.m \ +GapArray.m \ +Heap.m \ +IndexedCollection.m \ +Invocation.m \ +KeyedCollection.m \ +LinkedList.m \ +LinkedListNode.m \ +Lock.m \ +MachPort.m \ +Magnitude.m \ +MallocAddress.m \ +MappedCollector.m \ +MemoryStream.m \ +Notification.m \ +NotificationDispatcher.m \ +OrderedCollection.m \ +Port.m \ +Proxy.m \ +Queue.m \ +Random.m \ +RawCStream.m \ +RBTree.m \ +RBTreeNode.m \ +RNGAdditiveCongruential.m \ +RNGBerkeley.m \ +Set.m \ +SplayTree.m \ +Stack.m \ +StdioStream.m \ +Stream.m \ +TcpPort.m \ +TextCStream.m \ +Time.m \ +UdpPort.m \ +Unicode.m \ +UnixFileHandle.m \ +behavior.m \ +lex.pl.m \ +lex.sf.m \ +ostream.m \ +o_array.m \ +o_array_bas.m \ +o_array_cbs.m \ +o_cbs.m \ +o_cbs_char_p.m \ +o_cbs_id.m \ +o_cbs_int.m \ +o_cbs_int_p.m \ +o_cbs_void_p.m \ +o_hash.m \ +o_hash_bas.m \ +o_hash_cbs.m \ +o_list.m \ +o_list_bas.m \ +o_list_cbs.m \ +o_map.m \ +o_map_bas.m \ +o_map_cbs.m \ +preface.m \ +proplist.tab.m \ +stringsfile.tab.m \ +mframe.m \ +objc-gnu2next.m + +GNU_CFILES = \ +md5.c \ +numbers.c \ +o_vscanf.c + +GNU_OTHER_SRCFILES = \ +o_x_bas.m.in \ +o_x_cbs.m.in \ +include/o_x_bas.h.in \ +include/o_x_cbs.h.in \ +md5.h \ +proplist.l \ +proplist.tab.h \ +proplist.y \ +stringsfile.l \ +stringsfile.tab.h \ +stringsfile.y \ +win32-entry.m \ +win32-def.top \ +libgnustep-base.def + +GNU_HEADERS = \ +Archiver.h \ +Array.h \ +ArrayPrivate.h \ +Bag.h \ +BinaryCStream.h \ +BinaryTree.h \ +BinaryTreeNode.h \ +CircularArray.h \ +CircularArrayPrivate.h \ +Coder.h \ +CoderPrivate.h \ +Coding.h \ +Collecting.h \ +Collection.h \ +CollectionPrivate.h \ +ConnectedCoder.h \ +Connection.h \ +CStream.h \ +CStreaming.h \ +DelegatePool.h \ +Dictionary.h \ +Enumerating.h \ +GapArray.h \ +GapArrayPrivate.h \ +Heap.h \ +IndexedCollecting.h \ +IndexedCollection.h \ +IndexedCollectionPrivate.h \ +InvalidationListening.h \ +Invocation.h \ +Invoking.h \ +KeyedCollecting.h \ +KeyedCollection.h \ +LinkedList.h \ +LinkedListNode.h \ +Lock.h \ +Locking.h \ +MachPort.h \ +Magnitude.h \ +MallocAddress.h \ +MappedCollector.h \ +MemoryStream.h \ +Notification.h \ +NotificationDispatcher.h \ +Ordering.h \ +OrderedCollecting.h \ +OrderedCollection.h \ +Port.h \ +Proxy.h \ +Queue.h \ +RBTree.h \ +RBTreeNode.h \ +RNGAdditiveCongruential.h \ +RNGBerkeley.h \ +Random.h \ +RandomGenerating.h \ +RawCStream.h \ +Retaining.h \ +RetainingNotifier.h \ +RunLoop.h \ +Set.h \ +SplayTree.h \ +Stack.h \ +StdioStream.h \ +Stream.h \ +Streaming.h \ +TcpPort.h \ +TextCStream.h \ +Time.h \ +UdpPort.h \ +Unicode.h \ +UnixFileHandle.h \ +ValueHolding.h \ +behavior.h \ +fake-main.h \ +mframe.h \ +numbers.h \ +ostream.h \ +o_array.h \ +o_array_bas.h \ +o_array_cbs.h \ +o_cbs.h \ +o_hash.h \ +o_hash_bas.h \ +o_hash_cbs.h \ +o_list.h \ +o_list_bas.h \ +o_list_cbs.h \ +o_map.h \ +o_map_bas.h \ +o_map_cbs.h \ +objc-gnu2next.h \ +all.h \ +README \ +preface.h \ +config.h + +# NEXTSTEP source files + +NEXTSTEP_MFILES = \ +HashTable.m \ +List.m \ +NXStringTable.m \ +Storage.m + +NEXTSTEP_CFILES = + +NEXTSTEP_DERIVED_CFILES = \ +NXStringTable_scan.c + +NEXTSTEP_OTHER_SRCFILES = \ +NXStringTable_scan.l + +NEXTSTEP_HEADERS = \ +objc/HashTable.h \ +objc/List.h \ +objc/NXStringTable.h \ +objc/Storage.h \ +objc/zone.h + +# GNUStep source files + +BASE_MFILES = \ +NSAllocateObject.m \ +NSAttributedString.m \ +NSArchiver.m \ +NSArray.m \ +NSAssertionHandler.m \ +NSAutoreleasePool.m \ +NSBitmapCharSet.m \ +NSBundle.m \ +NSCalendarDate.m \ +NSCallBacks.m \ +NSCharacterSet.m \ +NSCoder.m \ +NSCopyObject.m \ +NSConcreteValue.m \ +NSCountedSet.m \ +NSConnection.m \ +NSData.m \ +NSDate.m \ +NSDebug.m \ +NSDeallocateObject.m \ +NSDictionary.m \ +NSDistantObject.m \ +NSEnumerator.m \ +NSException.m \ +NSFileHandle.m \ +NSFileManager.m \ +NSGeometry.m \ +NSGArchiver.m \ +NSGArray.m \ +NSGAttributedString.m \ +NSGCountedSet.m \ +NSGCString.m \ +NSGData.m \ +NSHData.m \ +NSGDictionary.m \ +NSGSet.m \ +NSGSequence.m \ +NSGString.m \ +NSHashTable.m \ +NSHost.m \ +NSInvocation.m \ +NSLock.m \ +NSLog.m \ +NSMapTable.m \ +NSMethodSignature.m \ +NSNotification.m \ +NSNotificationCenter.m \ +NSNotificationQueue.m \ +NSNumber.m \ +NSObjCRuntime.m \ +NSObject.m \ +NSPage.m \ +NSPipe.m \ +NSPort.m \ +NSPortCoder.m \ +NSProcessInfo.m \ +NSProxy.m \ +NSRange.m \ +NSRunLoop.m \ +NSScanner.m \ +NSSerializer.m \ +NSSet.m \ +NSString.m \ +NSThread.m \ +NSTimer.m \ +NSTimeZone.m \ +NSUser.m \ +NSUserDefaults.m \ +NSValue.m \ +NSZone.m \ +externs.m + +NSVALUE_MFILES = \ + NSValue0.m NSValue1.m NSValue2.m NSValue3.m \ + NSValue4.m +NSNUMBER_MFILES = \ + NSNumber0.m NSNumber1.m NSNumber2.m NSNumber3.m \ + NSNumber4.m NSNumber5.m NSNumber6.m NSNumber7.m \ + NSNumber8.m NSNumber9.m NSNumber10.m NSNumber11.m \ + NSNumber12.m + +BASE_CFILES = \ +find_exec.c \ +objc-load.c + +BASE_OTHER_SRCFILES = \ +NSConcreteNumber.m \ +NSCTemplateValue.m \ +dld-load.h \ +hpux-load.h \ +null-load.h \ +simple-load.h \ +NSCallBacks.h \ +NSHost.m \ +gdomap.c gdomap.h \ +tzfile.h + +BASE_HEADERS = \ +Foundation/byte_order.h \ +Foundation/DistributedObjects.h \ +Foundation/NSArchiver.h \ +Foundation/NSArray.h \ +Foundation/NSAttributedString.h \ +Foundation/NSAutoreleasePool.h \ +Foundation/NSBitmapCharSet.h \ +Foundation/NSBundle.h \ +Foundation/NSCharacterSet.h \ +Foundation/NSCoder.h \ +Foundation/NSConcreteNumber.h \ +Foundation/NSConcreteValue.h \ +Foundation/NSConnection.h \ +Foundation/NSData.h \ +Foundation/NSDate.h \ +Foundation/NSDebug.h \ +Foundation/NSDictionary.h \ +Foundation/NSDistantObject.h \ +Foundation/NSException.h \ +Foundation/NSFileHandle.h \ +Foundation/NSFileManager.h \ +Foundation/NSGeometry.h \ +Foundation/NSGArchiver.h \ +Foundation/NSGArray.h \ +Foundation/NSGAttributedString.h \ +Foundation/NSGCString.h \ +Foundation/NSGData.h \ +Foundation/NSHData.h \ +Foundation/NSGDictionary.h \ +Foundation/NSGSet.h \ +Foundation/NSGSequence.h \ +Foundation/NSGString.h \ +Foundation/NSHashTable.h \ +Foundation/NSHost.h \ +Foundation/NSInvocation.h \ +Foundation/NSLock.h \ +Foundation/NSMapTable.h \ +Foundation/NSMethodSignature.h \ +Foundation/NSNotification.h \ +Foundation/NSNotificationQueue.h \ +Foundation/NSObjCRuntime.h \ +Foundation/NSObject.h \ +Foundation/NSPage.h \ +Foundation/NSPathUtilities.h \ +Foundation/NSPort.h \ +Foundation/NSPortCoder.h \ +Foundation/NSProcessInfo.h \ +Foundation/NSProxy.h \ +Foundation/NSRange.h \ +Foundation/NSRunLoop.h \ +Foundation/NSScanner.h \ +Foundation/NSSerialization.h \ +Foundation/NSSet.h \ +Foundation/NSString.h \ +Foundation/NSThread.h \ +Foundation/NSTimer.h \ +Foundation/NSUserDefaults.h \ +Foundation/NSUtilities.h \ +Foundation/NSValue.h \ +Foundation/NSZone.h \ +Foundation/objc-load.h + +UNICODE_HEADERS = \ +unicode/caseconv.h \ +unicode/cop.h \ +unicode/cyrillic.h \ +unicode/decomp.h \ +unicode/nextstep.h + +HEADERS_INSTALL = $(GNU_HEADERS) \ + $(NEXTSTEP_HEADERS) \ + $(BASE_HEADERS) + +DIST_FILES = \ + Makefile.in AUTHORS Makefile.sed.nt \ + include/config.h.in include/preface.h.in \ + include/config-win32.h \ + $(GNU_MFILES) \ + $(GNU_CFILES) \ + $(GNU_HEADERS) \ + $(GNU_OTHER_SRCFILES) \ + $(NEXTSTEP_MFILES) \ + $(NEXTSTEP_CFILES) \ + $(NEXTSTEP_DERIVED_CFILES) \ + $(NEXTSTEP_HEADERS) \ + $(NEXTSTEP_OTHER_SRCFILES) \ + $(BASE_MFILES) \ + $(BASE_CFILES) \ + $(BASE_HEADERS) \ + $(BASE_OTHER_SRCFILES) \ + $(UNICODE_HEADERS) + +# The C source files to be compiled +C_FILES = $(GNU_CFILES) $(NEXTSTEP_CFILES) $(NEXTSTEP_DERIVED_CFILES) \ + $(BASE_CFILES) + +# The Objective-C source files to be compiled +OBJC_FILES = $(GNU_MFILES) $(NEXTSTEP_MFILES) $(BASE_MFILES) \ + $(NSVALUE_MFILES) $(NSNUMBER_MFILES) + +HEADER_FILES_DIR = . +HEADER_FILES_INSTALL_DIR = /gnustep/base + +HEADER_FILES = $(NEXTSTEP_HEADERS) $(BASE_HEADERS) + +-include Makefile.preamble + +include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/library.make + +-include Makefile.postamble diff --git a/Source/Makefile.in b/Source/Makefile.in deleted file mode 100644 index 0750a7019..000000000 --- a/Source/Makefile.in +++ /dev/null @@ -1,826 +0,0 @@ -# @configure_input@ -# -# src makefile for GNU Objective-C Class library -# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. -# -# Written by: Andrew Kachites McCallum -# -# This file is part of the GNU Objective-C Class library. -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Library General Public -# License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Library General Public License for more details. -# -# You should have received a copy of the GNU Library General Public -# License along with this library; if not, write to the Free -# Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -SHELL = /bin/sh - -#### Start of system configuration section. #### - -srcdir = @srcdir@ -VPATH = @srcdir@ - -# Installation locations -prefix = @prefix@ -exec_prefix = @exec_prefix@ -bindir = @bindir@ -libdir = @libdir@ -gnustep_libdir = $(libdir)/gnustep -includedir = @includedir@ - -CC = @CC@ @PIPE@ -LIBS = @LIBS@ -RANLIB = @RANLIB@ -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -AR = ar -AROUT = -ARFLAGS = rc -LN_S = @LN_S@ -MAKEINFO = makeinfo -TEXI2DVI = texi2dvi -LEX = flex -LEXFLAGS = -YACC = bison -DLLTOOL = @DLLTOOL@ - -# GNUSTEP_INSTALL_PREFIX must be defined here and not in config.h because -# the installing person may set it on the `make' command line. -DEFS= -DGNUSTEP_INSTALL_PREFIX=$(prefix) -DPLATFORM_OS=\"@PLATFORM_OS@\" \ - -DGNUSTEP_INSTALL_LIBDIR=\"$(gnustep_libdir)\" @DEFS@ - -# File name extensions -OEXT = .o -EXEEXT = -LIBEXT = .a - -# All these are optional. You can redefine CFLAGS, CPPFLAGS and -# INCLUDEFLAGS on the command line however you like. -CFLAGS = -g -O -Wall -Wno-implicit -CPPFLAGS = -INCLUDEFLAGS = - -#### End of system configuration section. #### - -include $(srcdir)/../Makeconf -include $(srcdir)/../Version - -# Grep for these names to build the legally-required "AUTHORS" file. -FILE_AUTHORS = \ -"Andrew Kachites McCallum" \ -"Kresten Krab Thorup" \ -"Adam Fedor" \ -"Mark Lakata" \ -"Jeremy Bettis" \ -"Georg Tuparev" \ -"Peter Burka" \ -"Albin L. Jones" \ -"Scott Christley" \ -"Luke Howard" \ -"Yoo C. Chung" \ -"Richard Frith-Macdonald" - -DYNAMIC_LINKER=@DYNAMIC_LINKER@ - -# Flags to pass to $(CC) for making a shared library -CFLAGS_SHAREDLIB_GNU = \ - -shared -Wl,-soname,lib$(LIBRARY_NAME).so.$(MAJOR_VERSION) -CFLAGS_SHAREDLIB_SOLARIS = -G -CFLAGS_SHAREDLIB = @CFLAGS_SHAREDLIB@ - -NEXT_NEXT_INCLUDES = -I/usr/include -GNU_NEXT_INCLUDES = -I$(srcdir) -NEXT_INCLUDES = @NEXT_INCLUDES@ - -ALL_INCLUDE_FLAGS = -I. -I./srcdir-include $(NEXT_INCLUDES) $(INCLUDEFLAGS) -ALL_CPPFLAGS = $(ALL_INCLUDE_FLAGS) $(CPPFLAGS) -ALL_CFLAGS = $(CFLAGS) -ALL_OBJCFLAGS = $(CFLAGS) -Wno-protocol - -# definitions to be passed to subdir Makefile's -MAKEDEFINES = CC='$(CC)' CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' \ -INCLUDEFLAGS='$(INCLUDEFLAGS)' DEFS='$(DEFS)' - -.SUFFIXES: .m -.m${OEXT}: - $(CC) -c $(ALL_CPPFLAGS) $(DEFS) $(ALL_OBJCFLAGS) -o $@ $< -.c${OEXT}: - $(CC) -c $(ALL_CPPFLAGS) $(DEFS) $(ALL_CFLAGS) -o $@ $< -%_pic${OEXT}: %.m - $(CC) -c $(ALL_CPPFLAGS) -fPIC -DPIC $(DEFS) \ - $(ALL_OBJCFLAGS) -o $@ $< -%_pic${OEXT}: %.c - $(CC) -c $(ALL_CPPFLAGS) -fPIC -DPIC $(DEFS) \ - $(ALL_CFLAGS) -o $@ $< - -# GNU Class source files -#RetainingNotifier.m \ - -GNU_MFILES = \ -Archiver.m \ -Array.m \ -Bag.m \ -BinaryCStream.m \ -BinaryTree.m \ -BinaryTreeNode.m \ -CircularArray.m \ -Collection.m \ -ConnectedCoder.m \ -Coder.m \ -Connection.m \ -CStream.m \ -Decoder.m \ -DelegatePool.m \ -Dictionary.m \ -Encoder.m \ -GapArray.m \ -Heap.m \ -IndexedCollection.m \ -Invocation.m \ -KeyedCollection.m \ -LinkedList.m \ -LinkedListNode.m \ -Lock.m \ -MachPort.m \ -Magnitude.m \ -MallocAddress.m \ -MappedCollector.m \ -MemoryStream.m \ -Notification.m \ -NotificationDispatcher.m \ -OrderedCollection.m \ -Port.m \ -Proxy.m \ -Queue.m \ -Random.m \ -RawCStream.m \ -RBTree.m \ -RBTreeNode.m \ -RNGAdditiveCongruential.m \ -RNGBerkeley.m \ -Set.m \ -SplayTree.m \ -Stack.m \ -StdioStream.m \ -Stream.m \ -TcpPort.m \ -TextCStream.m \ -Time.m \ -UdpPort.m \ -Unicode.m \ -UnixFileHandle.m \ -behavior.m \ -lex.pl.m \ -lex.sf.m \ -ostream.m \ -o_array.m \ -o_array_bas.m \ -o_array_cbs.m \ -o_cbs.m \ -o_cbs_char_p.m \ -o_cbs_id.m \ -o_cbs_int.m \ -o_cbs_int_p.m \ -o_cbs_void_p.m \ -o_hash.m \ -o_hash_bas.m \ -o_hash_cbs.m \ -o_list.m \ -o_list_bas.m \ -o_list_cbs.m \ -o_map.m \ -o_map_bas.m \ -o_map_cbs.m \ -preface.m \ -proplist.tab.m \ -stringsfile.tab.m \ -mframe.m \ -objc-gnu2next.m - -GNU_CFILES = \ -md5.c \ -numbers.c \ -o_vscanf.c - -GNU_OTHER_SRCFILES = \ -o_x_bas.m.in \ -o_x_cbs.m.in \ -include/o_x_bas.h.in \ -include/o_x_cbs.h.in \ -md5.h \ -proplist.l \ -proplist.tab.h \ -proplist.y \ -stringsfile.l \ -stringsfile.tab.h \ -stringsfile.y \ -win32-entry.m \ -win32-def.top \ -libgnustep-base.def - -GNU_OBJS = \ - $(GNU_MFILES:.m=${OEXT}) \ - $(GNU_CFILES:.c=${OEXT}) - -GNU_HEADERS = \ -include/Archiver.h \ -include/Array.h \ -include/ArrayPrivate.h \ -include/Bag.h \ -include/BinaryCStream.h \ -include/BinaryTree.h \ -include/BinaryTreeNode.h \ -include/CircularArray.h \ -include/CircularArrayPrivate.h \ -include/Coder.h \ -include/CoderPrivate.h \ -include/Coding.h \ -include/Collecting.h \ -include/Collection.h \ -include/CollectionPrivate.h \ -include/ConnectedCoder.h \ -include/Connection.h \ -include/CStream.h \ -include/CStreaming.h \ -include/DelegatePool.h \ -include/Dictionary.h \ -include/Enumerating.h \ -include/GapArray.h \ -include/GapArrayPrivate.h \ -include/Heap.h \ -include/IndexedCollecting.h \ -include/IndexedCollection.h \ -include/IndexedCollectionPrivate.h \ -include/InvalidationListening.h \ -include/Invocation.h \ -include/Invoking.h \ -include/KeyedCollecting.h \ -include/KeyedCollection.h \ -include/LinkedList.h \ -include/LinkedListNode.h \ -include/Lock.h \ -include/Locking.h \ -include/MachPort.h \ -include/Magnitude.h \ -include/MallocAddress.h \ -include/MappedCollector.h \ -include/MemoryStream.h \ -include/Notification.h \ -include/NotificationDispatcher.h \ -include/Ordering.h \ -include/OrderedCollecting.h \ -include/OrderedCollection.h \ -include/Port.h \ -include/Proxy.h \ -include/Queue.h \ -include/RBTree.h \ -include/RBTreeNode.h \ -include/RNGAdditiveCongruential.h \ -include/RNGBerkeley.h \ -include/Random.h \ -include/RandomGenerating.h \ -include/RawCStream.h \ -include/Retaining.h \ -include/RetainingNotifier.h \ -include/RunLoop.h \ -include/Set.h \ -include/SplayTree.h \ -include/Stack.h \ -include/StdioStream.h \ -include/Stream.h \ -include/Streaming.h \ -include/TcpPort.h \ -include/TextCStream.h \ -include/Time.h \ -include/UdpPort.h \ -include/Unicode.h \ -include/UnixFileHandle.h \ -include/ValueHolding.h \ -include/behavior.h \ -include/fake-main.h \ -include/mframe.h \ -include/numbers.h \ -include/ostream.h \ -include/o_array.h \ -include/o_array_bas.h \ -include/o_array_cbs.h \ -include/o_cbs.h \ -include/o_hash.h \ -include/o_hash_bas.h \ -include/o_hash_cbs.h \ -include/o_list.h \ -include/o_list_bas.h \ -include/o_list_cbs.h \ -include/o_map.h \ -include/o_map_bas.h \ -include/o_map_cbs.h \ -include/objc-gnu2next.h \ -include/all.h \ -include/README - -# NEXTSTEP source files - -NEXTSTEP_MFILES = \ -HashTable.m \ -List.m \ -NXStringTable.m \ -Storage.m - -NEXTSTEP_CFILES = - -NEXTSTEP_DERIVED_CFILES = \ -NXStringTable_scan.c - -NEXTSTEP_OTHER_SRCFILES = \ -NXStringTable_scan.l - -NEXTSTEP_OBJS = \ - $(NEXTSTEP_MFILES:.m=${OEXT}) \ - $(NEXTSTEP_CFILES:.c=${OEXT}) \ - $(NEXTSTEP_DERIVED_CFILES:.c=${OEXT}) - -NEXTSTEP_HEADERS = \ -objc/HashTable.h \ -objc/List.h \ -objc/NXStringTable.h \ -objc/Storage.h \ -objc/zone.h - -# GNUStep source files - -GNUSTEP_MFILES = \ -NSAllocateObject.m \ -NSAttributedString.m \ -NSArchiver.m \ -NSArray.m \ -NSAssertionHandler.m \ -NSAutoreleasePool.m \ -NSBitmapCharSet.m \ -NSBundle.m \ -NSCalendarDate.m \ -NSCallBacks.m \ -NSCharacterSet.m \ -NSCoder.m \ -NSCopyObject.m \ -NSConcreteValue.m \ -NSCountedSet.m \ -NSConnection.m \ -NSData.m \ -NSDate.m \ -NSDebug.m \ -NSDeallocateObject.m \ -NSDictionary.m \ -NSDistantObject.m \ -NSEnumerator.m \ -NSException.m \ -NSFileHandle.m \ -NSFileManager.m \ -NSGeometry.m \ -NSGArchiver.m \ -NSGArray.m \ -NSGAttributedString.m \ -NSGCountedSet.m \ -NSGCString.m \ -NSGData.m \ -NSHData.m \ -NSGDictionary.m \ -NSGSet.m \ -NSGSequence.m \ -NSGString.m \ -NSHashTable.m \ -NSHost.m \ -NSInvocation.m \ -NSLock.m \ -NSLog.m \ -NSMapTable.m \ -NSMethodSignature.m \ -NSNotification.m \ -NSNotificationCenter.m \ -NSNotificationQueue.m \ -NSNumber.m \ -NSObjCRuntime.m \ -NSObject.m \ -NSPage.m \ -NSPipe.m \ -NSPort.m \ -NSPortCoder.m \ -NSProcessInfo.m \ -NSProxy.m \ -NSRange.m \ -NSRunLoop.m \ -NSScanner.m \ -NSSerializer.m \ -NSSet.m \ -NSString.m \ -NSThread.m \ -NSTimer.m \ -NSTimeZone.m \ -NSUser.m \ -NSUserDefaults.m \ -NSValue.m \ -NSZone.m \ -externs.m - -NSVALUE_MFILES = \ - NSValue0.m NSValue1.m NSValue2.m NSValue3.m \ - NSValue4.m -NSNUMBER_MFILES = \ - NSNumber0.m NSNumber1.m NSNumber2.m NSNumber3.m \ - NSNumber4.m NSNumber5.m NSNumber6.m NSNumber7.m \ - NSNumber8.m NSNumber9.m NSNumber10.m NSNumber11.m \ - NSNumber12.m - -GNUSTEP_CFILES = \ -find_exec.c \ -objc-load.c - -GNUSTEP_OTHER_SRCFILES = \ -NSConcreteNumber.m \ -NSCTemplateValue.m \ -dld-load.h \ -hpux-load.h \ -null-load.h \ -simple-load.h \ -NSCallBacks.h \ -NSHost.m \ -gdomap.c gdomap.h \ -tzfile.h - -GNUSTEP_OBJS = \ - $(GNUSTEP_MFILES:.m=${OEXT}) \ - $(GNUSTEP_CFILES:.c=${OEXT}) \ - $(NSVALUE_MFILES:.m=${OEXT}) \ - $(NSNUMBER_MFILES:.m=${OEXT}) - -GNUSTEP_HEADERS = \ -include/byte_order.h \ -include/DistributedObjects.h \ -include/NSArchiver.h \ -include/NSArray.h \ -include/NSAttributedString.h \ -include/NSAutoreleasePool.h \ -include/NSBitmapCharSet.h \ -include/NSBundle.h \ -include/NSCharacterSet.h \ -include/NSCoder.h \ -include/NSConcreteNumber.h \ -include/NSConcreteValue.h \ -include/NSConnection.h \ -include/NSData.h \ -include/NSDate.h \ -include/NSDebug.h \ -include/NSDictionary.h \ -include/NSDistantObject.h \ -include/NSException.h \ -include/NSFileHandle.h \ -include/NSFileManager.h \ -include/NSGeometry.h \ -include/NSGArchiver.h \ -include/NSGArray.h \ -include/NSGAttributedString.h \ -include/NSGCString.h \ -include/NSGData.h \ -include/NSHData.h \ -include/NSGDictionary.h \ -include/NSGSet.h \ -include/NSGSequence.h \ -include/NSGString.h \ -include/NSHashTable.h \ -include/NSHost.h \ -include/NSInvocation.h \ -include/NSLock.h \ -include/NSMapTable.h \ -include/NSMethodSignature.h \ -include/NSNotification.h \ -include/NSNotificationQueue.h \ -include/NSObjCRuntime.h \ -include/NSObject.h \ -include/NSPage.h \ -include/NSPathUtilities.h \ -include/NSPort.h \ -include/NSPortCoder.h \ -include/NSProcessInfo.h \ -include/NSProxy.h \ -include/NSRange.h \ -include/NSRunLoop.h \ -include/NSScanner.h \ -include/NSSerialization.h \ -include/NSSet.h \ -include/NSString.h \ -include/NSThread.h \ -include/NSTimer.h \ -include/NSUserDefaults.h \ -include/NSUtilities.h \ -include/NSValue.h \ -include/NSZone.h \ -include/objc-load.h - -UNICODE_HEADERS = \ -unicode/caseconv.h \ -unicode/cop.h \ -unicode/cyrillic.h \ -unicode/decomp.h \ -unicode/nextstep.h - -HEADERS_INSTALL = @HEADERS_INSTALL@ \ - include/preface.h \ - include/config.h -OBJS_INSTALL = @OBJS_INSTALL@ -OBJS_INSTALL_PIC = $(OBJS_INSTALL:${OEXT}=_pic${OEXT}) - -DIST_FILES = \ - Makefile.in AUTHORS Makefile.sed.nt \ - include/config.h.in include/preface.h.in \ - include/config-win32.h \ - $(GNU_MFILES) \ - $(GNU_CFILES) \ - $(GNU_HEADERS) \ - $(GNU_OTHER_SRCFILES) \ - $(NEXTSTEP_MFILES) \ - $(NEXTSTEP_CFILES) \ - $(NEXTSTEP_DERIVED_CFILES) \ - $(NEXTSTEP_HEADERS) \ - $(NEXTSTEP_OTHER_SRCFILES) \ - $(GNUSTEP_MFILES) \ - $(GNUSTEP_CFILES) \ - $(GNUSTEP_HEADERS) \ - $(GNUSTEP_OTHER_SRCFILES) \ - $(UNICODE_HEADERS) - -IMPORT_LIBRARY=@IMPORT_LIBRARY@ - -# Targets - -all: \ -gnustep/base Foundation \ -@STATIC_LIBRARY@ \ -@SHARED_LIBRARY@ \ -gdomap - -lib$(LIBRARY_NAME).so.$(VERSION): $(HEADERS_INSTALL) $(OBJS_INSTALL_PIC) - $(CC) -o lib$(LIBRARY_NAME).so.$(VERSION) $(CFLAGS_SHAREDLIB) \ - $(OBJS_INSTALL_PIC) - rm -f lib$(LIBRARY_NAME).so.$(MAJOR_VERSION) - rm -f lib$(LIBRARY_NAME).so - $(LN_S) lib$(LIBRARY_NAME).so.$(VERSION) \ - lib$(LIBRARY_NAME).so.$(MAJOR_VERSION) - $(LN_S) lib$(LIBRARY_NAME).so.$(MAJOR_VERSION) \ - lib$(LIBRARY_NAME).so - -lib$(LIBRARY_NAME)$(LIBEXT): $(HEADERS_INSTALL) $(OBJS_INSTALL) - $(AR) $(ARFLAGS) $(AROUT)lib$(LIBRARY_NAME)$(LIBEXT) $(OBJS_INSTALL) - $(RANLIB) lib$(LIBRARY_NAME)$(LIBEXT) - -lib$(LIBRARY_NAME)_s$(LIBEXT): $(HEADERS_INSTALL) $(OBJS_INSTALL) - $(AR) $(ARFLAGS) $(AROUT)lib$(LIBRARY_NAME)_s$(LIBEXT) $(OBJS_INSTALL) - $(RANLIB) lib$(LIBRARY_NAME)_s$(LIBEXT) - -lib$(LIBRARY_NAME).def: FORCE - nm @STATIC_LIBRARY@ \ - | grep '^........ [T] _' \ - | sed 's/[^_]*_//' >> lib$(LIBRARY_NAME).lst - cat win32-def.top lib$(LIBRARY_NAME).lst > lib$(LIBRARY_NAME).def - rm lib$(LIBRARY_NAME).lst - -lib$(LIBRARY_NAME).dll: @STATIC_LIBRARY@ win32-entry$(OEXT) - # Link DLL. - $(CC) -dll -Wl,--base-file -Wl,lib$(LIBRARY_NAME).base \ - -o lib$(LIBRARY_NAME).dll win32-entry.o @STATIC_LIBRARY@ \ - -lmoldname -lobjc -lkernel32 -lwsock32 -ladvapi32 -luser32 - $(DLLTOOL) --dllname lib$(LIBRARY_NAME).dll \ - --def lib$(LIBRARY_NAME).def --base-file \ - lib$(LIBRARY_NAME).base --output-exp lib$(LIBRARY_NAME).exp - $(CC) -dll -Wl,--base-file -Wl,lib$(LIBRARY_NAME).base \ - lib$(LIBRARY_NAME).exp \ - -o lib$(LIBRARY_NAME).dll win32-entry.o @STATIC_LIBRARY@ \ - -lmoldname -lobjc -lkernel32 -lwsock32 -ladvapi32 -luser32 - $(DLLTOOL) --dllname lib$(LIBRARY_NAME).dll \ - --def lib$(LIBRARY_NAME).def \ - --base-file lib$(LIBRARY_NAME).base \ - --output-exp lib$(LIBRARY_NAME).exp - $(CC) -dll lib$(LIBRARY_NAME).exp \ - -o lib$(LIBRARY_NAME).dll win32-entry.o @STATIC_LIBRARY@ \ - -lmoldname -lobjc -lkernel32 -lwsock32 -ladvapi32 -luser32 - # Build the import library to link to: - $(DLLTOOL) --dllname lib$(LIBRARY_NAME).dll \ - --def lib$(LIBRARY_NAME).def \ - --output-lib $(IMPORT_LIBRARY) - ar r lib$(LIBRARY_NAME)$(LIBEXT) externs$(OEXT) - -# Local links to the include files -gnustep/base: $(HEADERS_INSTALL) - rm -rf gnustep - mkdir gnustep - cd gnustep ; $(LN_S) ../include base - # Make necessary links to source headers if compiling in seperate dir - # These are separate directories because one contains the .h files - # generated during the build; the other contains the unchanged sources. - if [ ! -r ./include/Collection.h ]; then \ - mkdir srcdir-include; \ - mkdir srcdir-include/gnustep; \ - (cd srcdir-include/gnustep; $(LN_S) ../../$(srcdir)/include ./base) ; \ - (cd srcdir-include; $(LN_S) ../$(srcdir)/include ./Foundation) ; \ - fi -# This deletion is necessary, because the CVS repository contains -# an emtpy `Foundation' directory that used to hold the OpenStep headers. -Foundation: ../configure $(HEADERS_INSTALL) - rm -rf Foundation - $(LN_S) $(srcdir)/include Foundation - -install: all installdirs install-headers install-lib install-apps - -installdirs: - $(srcdir)/../mkinstalldirs \ - $(bindir) \ - $(libdir) \ - $(includedir)/gnustep/base \ - $(includedir)/objc - -install-headers: all - # Install the headers - for file in $(HEADERS_INSTALL); do \ - $(INSTALL_DATA) $(srcdir)/$$file \ - $(includedir)/gnustep/base/`basename $$file` ; \ - done - cd $(includedir); rm -rf Foundation; $(LN_S) ./gnustep/base ./Foundation - for file in $(NEXTSTEP_HEADERS); do \ - $(INSTALL_DATA) $(srcdir)/$$file \ - $(includedir)/objc/`basename $$file` ; \ - done - -install-lib: all - # Install the library - $(INSTALL_DATA) lib$(LIBRARY_NAME)$(LIBEXT) $(libdir) - $(RANLIB) $(libdir)/lib$(LIBRARY_NAME)$(LIBEXT); \ - if [ -n "@SHARED_LIBRARY@" ]; then \ - if [ -e lib$(LIBRARY_NAME).so.$(VERSION) ] ; then \ - $(INSTALL_DATA) lib$(LIBRARY_NAME).so.$(VERSION) $(libdir) ; \ - rm -f $(libdir)/lib$(LIBRARY_NAME).so.$(MAJOR_VERSION) ; \ - rm -f $(libdir)/lib$(LIBRARY_NAME).so ; \ - $(LN_S) $(libdir)/lib$(LIBRARY_NAME).so.$(VERSION) \ - $(libdir)/lib$(LIBRARY_NAME).so.$(MAJOR_VERSION) ; \ - $(LN_S) $(libdir)/lib$(LIBRARY_NAME).so.$(MAJOR_VERSION) \ - $(libdir)/lib$(LIBRARY_NAME).so ; \ - fi \ - fi - # Install the DLL if it exists - if [ -e lib$(LIBRARY_NAME).dll ]; then \ - $(INSTALL_DATA) lib$(LIBRARY_NAME).dll $(bindir) ; \ - fi - -install-apps: gdomap - # Install the Distributed Objects name server - -$(INSTALL_PROGRAM) -o root -m 04755 gdomap $(bindir) - -uninstall: - rm -f $(libdir)/lib$(LIBRARY_NAME)$(LIBEXT) - rm -rf $(includedir)/gnustep/base - rm -rf $(includedir)/Foundation - for file in $(NEXTSTEP_HEADERS); do \ - rm -rf $(includedir)/objc/`basename $$file` ; \ - done - -# Creation of NSValue and NSNumber concrete classes from templates -$(NSVALUE_MFILES) : NSCTemplateValue.m - rm -f $@ - echo '#define TYPE_ORDER' `echo $@ | sed -e "s,[^0-9],,g"` >$@ - cat $(srcdir)/NSCTemplateValue.m >> $@ -$(NSNUMBER_MFILES) : NSConcreteNumber.m - rm -f $@ - echo '#define TYPE_ORDER' `echo $@ | sed -e "s,[^0-9],,g"` >$@ - cat $(srcdir)/NSConcreteNumber.m >> $@ - -gdomap: gdomap.c gdomap.h - $(CC) $(ALL_CPPFLAGS) $(DEFS) $(ALL_OBJCFLAGS) -w -o $@ $< $(LIBS) - -NXStringTable_scan.c: NXStringTable_scan.l - $(LEX) $(LEXFLAGS) -t $(srcdir)/NXStringTable_scan.l \ - > NXStringTable_scan.temp - sed "s/yy/NXlex_/g" < NXStringTable_scan.temp \ - > NXStringTable_scan.c - $(RM) -f NXStringTable_scan.temp -proplist.tab.m proplist.tab.h: proplist.y - rm -f proplist.tab.m.h - $(YACC) -d -p pl proplist.y -o proplist.tab.m - mv proplist.tab.m.h proplist.tab.h -lex.pl.m: proplist.l proplist.tab.h - $(LEX) -t -B -Ppl proplist.l > $@ - -stringsfile.tab.m stringsfile.tab.h: stringsfile.y - rm -f stringsfile.tab.m.h - $(YACC) -d -p sf stringsfile.y -o stringsfile.tab.m - mv stringsfile.tab.m.h stringsfile.tab.h -lex.sf.m: stringsfile.l stringsfile.tab.h - $(LEX) -t -B -Psf stringsfile.l > $@ - -objc-load${OEXT}: dynamic-load.h - -dynamic-load.h: ../config.status - rm -f dynamic-load.h - cp $(srcdir)/$(DYNAMIC_LINKER)-load.h dynamic-load.h - -include/preface.h: $(srcdir)/include/preface.h.in ../Version - rm -f $@ - sed -e "s/@VERSION@/$(LIBRARY_VAR)_VERSION $(VERSION)/" \ - < $(srcdir)/include/preface.h.in | \ - sed -e "s/@MAJOR_VERSION@/$(LIBRARY_VAR)_MAJOR_VERSION $(MAJOR_VERSION)/" | \ - sed -e "s/@MINOR_VERSION@/$(LIBRARY_VAR)_MINOR_VERSION $(MINOR_VERSION)/" | \ - sed -e "s/@SUBMINOR_VERSION@/$(LIBRARY_VAR)_SUBMINOR_VERSION $(SUBMINOR_VERSION)/" | \ - sed -e "s/@GCC_VERSION@/$(LIBRARY_VAR)_GCC_VERSION $(GCC_VERSION)/" | \ - sed -e "s/@LIBRARY_NAME@/$(LIBRARY_VAR)_LIBRARY_NAME $(LIBRARY_NAME)/" | \ - sed -e "s/@PACKAGE_NAME@/$(LIBRARY_VAR)_PACKAGE_NAME $(PACKAGE_NAME)/" \ - > $@ -preface${OEXT}: include/preface.h - -# Turn off warnings for o_vscanf.c, it generates a bunch of unimportant ones. -o_vscanf${OEXT}: o_vscanf.c - $(CC) -c $(ALL_CPPFLAGS) $(DEFS) $(ALL_OBJCFLAGS) -w -o $@ $< -o_vscanf_pic${OEXT}: o_vscanf.c - $(CC) -c $(ALL_CPPFLAGS) $(DEFS) $(ALL_OBJCFLAGS) -w -o $@ $< - -include/o_%_bas.h: include/o_x_bas.h.in - sed -e "s/@XX@/$*/g" $< > $@ - -include/o_%_cbs.h: include/o_x_cbs.h.in - sed -e "s/@YY@/$*/g" $< > $@ - -o_%_bas.m: o_x_bas.m.in include/o_%.h - sed -e "s/@XX@/$*/g" $< > $@ - -o_%_cbs.m: o_x_cbs.m.in include/o_%.h - sed -e "s/@YY@/$*/g" $< > $@ - -o_array.o: o_array.m include/o_array.h -include/o_array.h: include/o_array_bas.h include/o_array_cbs.h include/o_hash.h -o_hash.o: o_hash.m include/o_hash.h -include/o_hash.h: include/o_hash_bas.h include/o_hash_cbs.h -o_list.o: o_list.m include/o_list.h -include/o_list.h: include/o_list_bas.h include/o_list_cbs.h include/o_array.h include/o_hash.h -o_map.o: o_map.m include/o_map.h -include/o_map.h: include/o_map_bas.h include/o_map_cbs.h include/o_hash.h - - -Makefile: $(srcdir)/Makefile.in ../config.status - cd ..; $(SHELL) config.status -../config.status: - cd ..; $(SHELL) $(srcdir)/configure --no-create -$(srcdir)/include/config.h.in: $(srcdir)/../configure.in $(srcdir)/../acconfig.h - cd $(srcdir)/..; $(SHELL) autoheader -include/config.h: $(srcdir)/include/config.h.in - -TAGS: $(DIST_FILES) - etags $(DIST_FILES) - -AUTHORS: Makefile.in - rm -f AUTHORS - @echo Finding file authors... - @echo 'For the legal record, here is a list of who wrote what:'>AUTHORS - @for a in $(FILE_AUTHORS) \ - ; do \ - echo >>AUTHORS; \ - echo >>AUTHORS; \ - echo "$${a}:" >>AUTHORS; \ - egrep -l "((Written by)|(Author)|(Rewritten by)).*$${a}" \ - $(DIST_FILES) >>AUTHORS; \ - done - -mostlyclean: - rm -f core \ - *~ \ - include/*~ \ - objc/*~ -clean: mostlyclean - rm -f lib$(LIBRARY_NAME)$(LIBEXT) *${OEXT} - rm -f lib$(LIBRARY_NAME)_s$(LIBEXT) - rm -f lib$(LIBRARY_NAME).dll - rm -f $(NSVALUE_MFILES) $(NSNUMBER_MFILES) - rm -f gdomap -distclean: clean - rm -f Makefile - rm -f dynamic-load.h - rm -f include/preface.h include/config.h - rm -f Foundation gnustep/base - rm -f o_*_bas.m o_*_cbs.m include/o_*_bas.h include/o_*_cbs.h -maintainer-clean: distclean - rm -f TAGS - -copy-dist: $(DIST_FILES) - mkdir ../snap/src - mkdir ../snap/src/include - mkdir ../snap/src/objc - mkdir ../snap/src/unicode - for file in $(DIST_FILES); do \ - ln $$file ../snap/src/$$file ; \ - done - ln AUTHORS ../snap - -FORCE: diff --git a/Source/Makefile.postamble b/Source/Makefile.postamble new file mode 100644 index 000000000..656592106 --- /dev/null +++ b/Source/Makefile.postamble @@ -0,0 +1,204 @@ +# +# Makefile.postamble +# +# Copyright (C) 1997 Free Software Foundation, Inc. +# +# Author: Scott Christley +# +# This file is part of the GNUstep Base Library. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# If you are interested in a warranty or support for this source code, +# contact Scott Christley at scottc@net-community.com +# +# You should have received a copy of the GNU Library General Public +# License along with this library; see the file COPYING.LIB. +# If not, write to the Free Software Foundation, +# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +# +# Makefile.postamble +# +# Project specific makefile rules +# +# Uncomment the targets you want. +# The double colons (::) are important, do not make them single colons +# otherwise the normal makefile rules will not be performed. +# + +# Things to do before compiling +before-all:: gnustep/base Foundation + +# Things to do after compiling +# after-all:: + +# Things to do before installing +# before-install:: + +# Things to do after installing +# +# Unfortunately the way the header files are placed in relationship +# to the source we must install the GNU header manually +after-install:: + for file in $(GNU_HEADERS); do \ + $(INSTALL_DATA) ./include/$$file \ + $(GNUSTEP_HEADERS)/gnustep/base/$$file ; \ + done + +# Things to do before uninstalling +# before-uninstall:: + +# Things to do after uninstalling +after-uninstall:: + +# Things to do before cleaning +# before-clean:: + +# Things to do after cleaning +# after-clean:: + +# Things to do before distcleaning +# before-distclean:: + +# Things to do after distcleaning +# after-distclean:: + +# Things to do before checking +# before-check:: + +# Things to do after checking +# after-check:: + +# Local links to the include files +gnustep/base: FORCE + rm -rf gnustep + mkdir gnustep + cd gnustep ; $(LN_S) ../include base + # Make necessary links to source headers if compiling in seperate dir + # These are separate directories because one contains the .h files + # generated during the build; the other contains the unchanged sources. + if [ ! -r ./include/Collection.h ]; then \ + mkdir srcdir-include; \ + mkdir srcdir-include/gnustep; \ + (cd srcdir-include/gnustep; $(LN_S) ../../$(srcdir)/include ./base) ; \ + (cd srcdir-include; $(LN_S) ../$(srcdir)/include ./Foundation) ; \ + fi +# This deletion is necessary, because the CVS repository contains +# an emtpy `Foundation' directory that used to hold the OpenStep headers. +Foundation: FORCE + rm -rf Foundation + $(LN_S) $(srcdir)/include Foundation + +# Creation of NSValue and NSNumber concrete classes from templates +$(NSVALUE_MFILES) : NSCTemplateValue.m + rm -f $@ + echo '#define TYPE_ORDER' `echo $@ | sed -e "s,[^0-9],,g"` >$@ + cat $(srcdir)/NSCTemplateValue.m >> $@ +$(NSNUMBER_MFILES) : NSConcreteNumber.m + rm -f $@ + echo '#define TYPE_ORDER' `echo $@ | sed -e "s,[^0-9],,g"` >$@ + cat $(srcdir)/NSConcreteNumber.m >> $@ + +gdomap: gdomap.c gdomap.h + $(CC) $(ALL_CPPFLAGS) $(DEFS) $(ALL_OBJCFLAGS) -w -o $@ $< $(LIBS) + +NXStringTable_scan.c: NXStringTable_scan.l + $(LEX) $(LEXFLAGS) -t $(srcdir)/NXStringTable_scan.l \ + > NXStringTable_scan.temp + sed "s/yy/NXlex_/g" < NXStringTable_scan.temp \ + > NXStringTable_scan.c + $(RM) -f NXStringTable_scan.temp +proplist.tab.m proplist.tab.h: proplist.y + rm -f proplist.tab.m.h + $(YACC) -d -p pl proplist.y -o proplist.tab.m + mv proplist.tab.m.h proplist.tab.h +lex.pl.m: proplist.l proplist.tab.h + $(LEX) -t -B -Ppl proplist.l > $@ + +stringsfile.tab.m stringsfile.tab.h: stringsfile.y + rm -f stringsfile.tab.m.h + $(YACC) -d -p sf stringsfile.y -o stringsfile.tab.m + mv stringsfile.tab.m.h stringsfile.tab.h +lex.sf.m: stringsfile.l stringsfile.tab.h + $(LEX) -t -B -Psf stringsfile.l > $@ + +objc-load${OEXT}: dynamic-load.h + +dynamic-load.h: ../config.status + rm -f dynamic-load.h + cp $(srcdir)/$(DYNAMIC_LINKER)-load.h dynamic-load.h + +include/preface.h: $(srcdir)/include/preface.h.in ../Version + rm -f $@ + sed -e "s/@VERSION@/$(LIBRARY_VAR)_VERSION $(VERSION)/" \ + < $(srcdir)/include/preface.h.in | \ + sed -e "s/@MAJOR_VERSION@/$(LIBRARY_VAR)_MAJOR_VERSION $(MAJOR_VERSION)/" | \ + sed -e "s/@MINOR_VERSION@/$(LIBRARY_VAR)_MINOR_VERSION $(MINOR_VERSION)/" | \ + sed -e "s/@SUBMINOR_VERSION@/$(LIBRARY_VAR)_SUBMINOR_VERSION $(SUBMINOR_VERSION)/" | \ + sed -e "s/@GCC_VERSION@/$(LIBRARY_VAR)_GCC_VERSION $(GCC_VERSION)/" | \ + sed -e "s/@LIBRARY_NAME@/$(LIBRARY_VAR)_LIBRARY_NAME $(LIBRARY_NAME)/" | \ + sed -e "s/@PACKAGE_NAME@/$(LIBRARY_VAR)_PACKAGE_NAME $(PACKAGE_NAME)/" \ + > $@ +preface${OEXT}: include/preface.h + +# Turn off warnings for o_vscanf.c, it generates a bunch of unimportant ones. +o_vscanf${OEXT}: o_vscanf.c + $(CC) -c $(ALL_CPPFLAGS) $(DEFS) $(ALL_OBJCFLAGS) -w -o $@ $< +o_vscanf_pic${OEXT}: o_vscanf.c + $(CC) -c $(ALL_CPPFLAGS) $(DEFS) $(ALL_OBJCFLAGS) -w -o $@ $< + +include/o_%_bas.h: include/o_x_bas.h.in + sed -e "s/@XX@/$*/g" $< > $@ + +include/o_%_cbs.h: include/o_x_cbs.h.in + sed -e "s/@YY@/$*/g" $< > $@ + +o_%_bas.m: o_x_bas.m.in include/o_%.h + sed -e "s/@XX@/$*/g" $< > $@ + +o_%_cbs.m: o_x_cbs.m.in include/o_%.h + sed -e "s/@YY@/$*/g" $< > $@ + +o_array.o: o_array.m include/o_array.h +include/o_array.h: include/o_array_bas.h include/o_array_cbs.h include/o_hash.h +o_hash.o: o_hash.m include/o_hash.h +include/o_hash.h: include/o_hash_bas.h include/o_hash_cbs.h +o_list.o: o_list.m include/o_list.h +include/o_list.h: include/o_list_bas.h include/o_list_cbs.h include/o_array.h include/o_hash.h +o_map.o: o_map.m include/o_map.h +include/o_map.h: include/o_map_bas.h include/o_map_cbs.h include/o_hash.h + +TAGS: $(DIST_FILES) + etags $(DIST_FILES) + +AUTHORS: Makefile.in + rm -f AUTHORS + @echo Finding file authors... + @echo 'For the legal record, here is a list of who wrote what:'>AUTHORS + @for a in $(FILE_AUTHORS) \ + ; do \ + echo >>AUTHORS; \ + echo >>AUTHORS; \ + echo "$${a}:" >>AUTHORS; \ + egrep -l "((Written by)|(Author)|(Rewritten by)).*$${a}" \ + $(DIST_FILES) >>AUTHORS; \ + done + +copy-dist: $(DIST_FILES) + mkdir ../snap/src + mkdir ../snap/src/include + mkdir ../snap/src/objc + mkdir ../snap/src/unicode + for file in $(DIST_FILES); do \ + ln $$file ../snap/src/$$file ; \ + done + ln AUTHORS ../snap diff --git a/Source/Makefile.preamble b/Source/Makefile.preamble new file mode 100644 index 000000000..e9661d2c6 --- /dev/null +++ b/Source/Makefile.preamble @@ -0,0 +1,68 @@ +# +# Makefile.preamble +# +# Copyright (C) 1997 Free Software Foundation, Inc. +# +# Author: Scott Christley +# +# This file is part of the GNUstep Base Library. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# If you are interested in a warranty or support for this source code, +# contact Scott Christley at scottc@net-community.com +# +# You should have received a copy of the GNU Library General Public +# License along with this library; see the file COPYING.LIB. +# If not, write to the Free Software Foundation, +# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +# +# Makefile.preamble +# +# Project specific makefile variables +# +# Do not put any Makefile rules in this file, instead they should +# be put into Makefile.postamble. +# + +# +# Flags dealing with compiling and linking +# + +# Additional flags to pass to the preprocessor +ADDITIONAL_CPPFLAGS = $(DEFS) + +# Additional flags to pass to the Objective-C compiler +ADDITIONAL_OBJCFLAGS = + +# Additional flags to pass to the C compiler +ADDITIONAL_CFLAGS = + +# Additional include directories the compiler should search +ADDITIONAL_INCLUDE_DIRS = -I./srcdir-include + +# Additional LDFLAGS to pass to the linker +ADDITIONAL_LDFLAGS = + +# Additional library directories the linker should search +ADDITIONAL_LIB_DIRS = + +# +# Flags dealing with installing and uninstalling +# + +# Additional directories to be created during installation +ADDITIONAL_INSTALL_DIRS = $(GNUSTEP_HEADERS)/gnustep \ + $(GNUSTEP_HEADERS)/gnustep/base \ + $(GNUSTEP_HEADERS)/gnustep/base/Foundation \ + $(GNUSTEP_HEADERS)/gnustep/base/objc \ + $(GNUSTEP_HEADERS)/gnustep/base/unicode \ diff --git a/Testing/Makefile.preamble b/Testing/Makefile.preamble new file mode 100644 index 000000000..1be3cad1e --- /dev/null +++ b/Testing/Makefile.preamble @@ -0,0 +1,61 @@ +# +# checks makefile for the GNUstep Base Library +# +# Copyright (C) 1997 Free Software Foundation, Inc. +# +# Written by: Scott Christley +# +# This file is part of the GNUstep Base Library. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this library; if not, write to the Free +# Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# + +# +# Makefile.preamble +# +# Project specific makefile variables, and additional +# +# Do not put any Makefile rules in this file, instead they should +# be put into Makefile.postamble. +# + +# +# Flags dealing with compiling and linking +# + +# Additional flags to pass to the preprocessor +ADDITIONAL_CPPFLAGS = + +# Additional flags to pass to the Objective-C compiler +ADDITIONAL_OBJCFLAGS = + +# Additional flags to pass to the C compiler +ADDITIONAL_CFLAGS = + +# Additional include directories the compiler should search +ADDITIONAL_INCLUDE_DIRS = -I../src -I../src/srcdir-include + +# Additional LDFLAGS to pass to the linker +ADDITIONAL_LDFLAGS = + +# Additional library directories the linker should search +ADDITIONAL_LIB_DIRS = -L../src/$(GNUSTEP_OBJ_DIR) + +# +# Flags dealing with installing and uninstalling +# + +# Additional directories to be created during installation +ADDITIONAL_INSTALL_DIRS = diff --git a/Testing/coder.m b/Testing/coder.m index a4107c5d2..709188b2b 100644 --- a/Testing/coder.m +++ b/Testing/coder.m @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include diff --git a/Testing/cstream.m b/Testing/cstream.m index d5f1614f8..c11904119 100644 --- a/Testing/cstream.m +++ b/Testing/cstream.m @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include diff --git a/Testing/oldserver.m b/Testing/oldserver.m index 5f0819a73..90c1d9de4 100644 --- a/Testing/oldserver.m +++ b/Testing/oldserver.m @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include "oldserver.h" @implementation Server diff --git a/Testing/string.m b/Testing/string.m index 19551ea45..7cbe2dbcb 100644 --- a/Testing/string.m +++ b/Testing/string.m @@ -1,7 +1,7 @@ #include /* For demo of Strings as Collections of char's. */ -#include +#include void print_string(NSString* s) diff --git a/config.mak.in b/config.mak.in new file mode 100644 index 000000000..3d863ce8f --- /dev/null +++ b/config.mak.in @@ -0,0 +1,4 @@ +# +# +# +DYNAMIC_LINKER=@DYNAMIC_LINKER@ diff --git a/configure.in b/configure.in index dbc0b83bd..26ea90e36 100644 --- a/configure.in +++ b/configure.in @@ -418,8 +418,7 @@ AC_SUBST(no_whole_archive) #-------------------------------------------------------------------- # Write the Makefiles #-------------------------------------------------------------------- -AC_OUTPUT(Makefile src/Makefile checks/Makefile examples/Makefile -doc/Makefile NSCharacterSets/Makefile admin/Makefile) +AC_OUTPUT(config.mak) dnl Local Variables: dnl comment-start: "dnl "