mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-22 16:33:29 +00:00
Use new make facilities if available, os that things should work if people
forget to source GNUstep.sh or set GNUSTEP_MAKEFILES git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@24652 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm
parent
bb10f97faf
commit
3c33db790d
16 changed files with 6834 additions and 6509 deletions
11
ChangeLog
11
ChangeLog
|
|
@ -1,3 +1,14 @@
|
|||
2007-02-17 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* configure.ac: Use gnustep-config if available.
|
||||
* configure: Regenerate
|
||||
* Source/Makefile.postamble
|
||||
* Source/GNUmakefile
|
||||
* Source/Makefile.preamble
|
||||
* SSL/GSSSLHandle.m
|
||||
* SSL/GNUmakefile
|
||||
* GNUmakefile
|
||||
|
||||
2007-02-17 Sergii Stoian <stoyan255@gmail.com>
|
||||
|
||||
* Headers/GNUstepBase/GSFileHandle.h: Fix GSConfig.h include.
|
||||
|
|
|
|||
|
|
@ -25,6 +25,15 @@
|
|||
GNUSTEP_INSTALLATION_DOMAIN = SYSTEM
|
||||
|
||||
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make
|
||||
|
||||
GNUSTEP_MAKEFILES?=$(shell gnustep-config GNUSTEP_MAKEFILES 2>/dev/null)
|
||||
|
||||
# This usually happens when you source GNUstep.sh, then run ./configure,
|
||||
# then log out, then log in again and try to compile
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
$(error You need to set GNUSTEP_MAKEFILES before compiling!)
|
||||
endif
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
|
||||
include ../Version
|
||||
|
|
|
|||
|
|
@ -19,10 +19,20 @@
|
|||
#
|
||||
# You should have received a copy of the GNU General Public
|
||||
# License along with this library; if not, write to the Free
|
||||
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
|
||||
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
# Boston, MA 02111 USA.
|
||||
#
|
||||
|
||||
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES = ../base.make
|
||||
|
||||
GNUSTEP_MAKEFILES?=$(shell gnustep-config GNUSTEP_MAKEFILES 2>/dev/null)
|
||||
|
||||
# This usually happens when you source GNUstep.sh, then run ./configure,
|
||||
# then log out, then log in again and try to compile
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
$(error You need to set GNUSTEP_MAKEFILES before compiling!)
|
||||
endif
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
|
||||
# The tools to be created
|
||||
|
|
|
|||
|
|
@ -23,10 +23,12 @@
|
|||
# Boston, MA 02111 USA
|
||||
#
|
||||
|
||||
GNUSTEP_MAKEFILES?=$(shell gnustep-config GNUSTEP_MAKEFILES 2>/dev/null)
|
||||
|
||||
# This usually happens when you source GNUstep.sh, then run ./configure,
|
||||
# then log out, then log in again and try to compile
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
$(error You need to run the GNUstep configuration script before compiling!)
|
||||
$(error You need to set GNUSTEP_MAKEFILES before compiling!)
|
||||
endif
|
||||
|
||||
# Install into the system root by default
|
||||
|
|
|
|||
|
|
@ -25,6 +25,15 @@
|
|||
GNUSTEP_INSTALLATION_DOMAIN = SYSTEM
|
||||
|
||||
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make
|
||||
|
||||
GNUSTEP_MAKEFILES?=$(shell gnustep-config GNUSTEP_MAKEFILES 2>/dev/null)
|
||||
|
||||
# This usually happens when you source GNUstep.sh, then run ./configure,
|
||||
# then log out, then log in again and try to compile
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
$(error You need to set GNUSTEP_MAKEFILES before compiling!)
|
||||
endif
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
|
||||
CHARSET_FILES = \
|
||||
|
|
|
|||
|
|
@ -18,12 +18,22 @@
|
|||
#
|
||||
# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
|
||||
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
# Boston, MA 02111 USA.
|
||||
|
||||
# Install into the system root by default
|
||||
GNUSTEP_INSTALLATION_DOMAIN = SYSTEM
|
||||
|
||||
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make
|
||||
|
||||
GNUSTEP_MAKEFILES?=$(shell gnustep-config GNUSTEP_MAKEFILES 2>/dev/null)
|
||||
|
||||
# This usually happens when you source GNUstep.sh, then run ./configure,
|
||||
# then log out, then log in again and try to compile
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
$(error You need to set GNUSTEP_MAKEFILES before compiling!)
|
||||
endif
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
|
||||
include ../Version
|
||||
|
|
|
|||
|
|
@ -19,11 +19,21 @@
|
|||
#
|
||||
# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
|
||||
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
# Boston, MA 02111 USA.
|
||||
|
||||
GNUSTEP_INSTALLATION_DOMAIN = SYSTEM
|
||||
|
||||
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make
|
||||
|
||||
GNUSTEP_MAKEFILES?=$(shell gnustep-config GNUSTEP_MAKEFILES 2>/dev/null)
|
||||
|
||||
# This usually happens when you source GNUstep.sh, then run ./configure,
|
||||
# then log out, then log in again and try to compile
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
$(error You need to set GNUSTEP_MAKEFILES before compiling!)
|
||||
endif
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
|
||||
RESOURCE_SET_NAME = base-resources
|
||||
|
|
|
|||
|
|
@ -19,7 +19,8 @@
|
|||
#
|
||||
# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
|
||||
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
# Boston, MA 02111 USA.
|
||||
#
|
||||
|
||||
# Install into the system root by default
|
||||
|
|
@ -29,8 +30,14 @@ GNUSTEP_INSTALLATION_DOMAIN = SYSTEM
|
|||
# Additional makefiles.
|
||||
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make
|
||||
|
||||
# Include common.make as the first thing, as this defined
|
||||
# FOUNDATION_LIB which is used in ../config.mak
|
||||
GNUSTEP_MAKEFILES?=$(shell gnustep-config GNUSTEP_MAKEFILES 2>/dev/null)
|
||||
|
||||
# This usually happens when you source GNUstep.sh, then run ./configure,
|
||||
# then log out, then log in again and try to compile
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
$(error You need to set GNUSTEP_MAKEFILES before compiling!)
|
||||
endif
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
|
||||
-include ../config.mak
|
||||
|
|
|
|||
|
|
@ -50,7 +50,6 @@
|
|||
#include <openssl/err.h>
|
||||
#undef id
|
||||
|
||||
#include <GSConfig.h>
|
||||
#include <Foundation/Foundation.h>
|
||||
|
||||
#include <GNUstepBase/GSFileHandle.h>
|
||||
|
|
|
|||
|
|
@ -27,6 +27,15 @@
|
|||
GNUSTEP_INSTALLATION_DOMAIN = SYSTEM
|
||||
|
||||
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make
|
||||
|
||||
GNUSTEP_MAKEFILES?=$(shell gnustep-config GNUSTEP_MAKEFILES 2>/dev/null)
|
||||
|
||||
# This usually happens when you source GNUstep.sh, then run ./configure,
|
||||
# then log out, then log in again and try to compile
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
$(error You need to set GNUSTEP_MAKEFILES before compiling!)
|
||||
endif
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
|
||||
include ../Version
|
||||
|
|
@ -65,7 +74,6 @@ DEFS= -DGNUSTEP_TARGET_DIR=\"$(GNUSTEP_TARGET_DIR)\" \
|
|||
-DGNUSTEP_IS_FLATTENED=\"$(GNUSTEP_IS_FLATTENED)\" \
|
||||
-DLIBRARY_COMBO=\"$(LIBRARY_COMBO)\"
|
||||
|
||||
|
||||
else
|
||||
|
||||
DEFS= -DGNUSTEP_TARGET_DIR=\"$(GNUSTEP_TARGET_DIR)\" \
|
||||
|
|
|
|||
|
|
@ -96,7 +96,8 @@ after-clean::
|
|||
after-distclean::
|
||||
rm -f mframe/mframe.h Foundation \
|
||||
NSNumber[0-9]*.m GSValue[0-9]*.m
|
||||
rm -rf $(GNUSTEP_TARGET_DIR)/config.h
|
||||
rm -rf $(GNUSTEP_TARGET_DIR)/GNUstepBase
|
||||
rm -rf $(GNUSTEP_TARGET_DIR)/mframe.h
|
||||
rm -rf $(GNUSTEP_TARGET_DIR)/mframe.h
|
||||
rm -rf $(GNUSTEP_TARGET_CPU)
|
||||
|
||||
|
|
@ -124,7 +125,7 @@ $(GNUSTEP_TARGET_DIR)/config.h: ../config.status
|
|||
|
||||
$(GNUSTEP_TARGET_DIR)/GNUstepBase/GSConfig.h: ../config.status
|
||||
$(MKDIRS) $(GNUSTEP_TARGET_DIR)/GNUstepBase
|
||||
-mv $(GNUSTEP_TARGET_DIR)/GSConfig.h $(GNUSTEP_TARGET_DIR)/GNUstepBase
|
||||
-mv $(HEADER_DIR_BASE)/GSConfig.h $(GNUSTEP_TARGET_DIR)/GNUstepBase
|
||||
-touch $(GNUSTEP_TARGET_DIR)/GNUstepBase/GSConfig.h
|
||||
|
||||
$(GNUSTEP_TARGET_DIR)/mframe.h: mframe/config.status
|
||||
|
|
|
|||
|
|
@ -62,8 +62,10 @@ ADDITIONAL_OBJCFLAGS =
|
|||
ADDITIONAL_CFLAGS =
|
||||
|
||||
# Additional include directories the compiler should search
|
||||
ADDITIONAL_INCLUDE_DIRS = -I../Headers/Additions -I../Headers \
|
||||
-I./$(GNUSTEP_TARGET_DIR)
|
||||
ADDITIONAL_INCLUDE_DIRS = \
|
||||
-I../Headers/Additions \
|
||||
-I../Headers \
|
||||
-I./$(GNUSTEP_TARGET_DIR)
|
||||
|
||||
# Additional LDFLAGS to pass to the linker
|
||||
ADDITIONAL_LDFLAGS =
|
||||
|
|
|
|||
|
|
@ -23,6 +23,15 @@
|
|||
#
|
||||
|
||||
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make
|
||||
|
||||
GNUSTEP_MAKEFILES?=$(shell gnustep-config GNUSTEP_MAKEFILES 2>/dev/null)
|
||||
|
||||
# This usually happens when you source GNUstep.sh, then run ./configure,
|
||||
# then log out, then log in again and try to compile
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
$(error You need to set GNUSTEP_MAKEFILES before compiling!)
|
||||
endif
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
|
||||
include ../Version
|
||||
|
|
|
|||
|
|
@ -25,6 +25,15 @@
|
|||
GNUSTEP_INSTALLATION_DOMAIN = SYSTEM
|
||||
|
||||
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make
|
||||
|
||||
GNUSTEP_MAKEFILES?=$(shell gnustep-config GNUSTEP_MAKEFILES 2>/dev/null)
|
||||
|
||||
# This usually happens when you source GNUstep.sh, then run ./configure,
|
||||
# then log out, then log in again and try to compile
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
$(error You need to set GNUSTEP_MAKEFILES before compiling!)
|
||||
endif
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
|
||||
include ../Version
|
||||
|
|
|
|||
10
configure.ac
10
configure.ac
|
|
@ -20,7 +20,8 @@
|
|||
#
|
||||
# You should have received a copy of the GNU General Public
|
||||
# License along with this library; if not, write to the Free
|
||||
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA
|
||||
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
# Boston, MA 02111 USA
|
||||
builtin(include, config/objc-con-autoload.m4)dnl
|
||||
builtin(include, config/objc-sys-dynamic.m4)dnl
|
||||
builtin(include, config/procfs-exe-link.m4)dnl
|
||||
|
|
@ -32,8 +33,15 @@ builtin(include, config/addlibrarypath.m4)dnl
|
|||
AC_INIT
|
||||
AC_CONFIG_SRCDIR([Source/NSArray.m])
|
||||
|
||||
# Where GNUSTEP_MAKEFILES is undefined, use gnustep-config if it is available.
|
||||
if test -z "$GNUSTEP_MAKEFILES"; then
|
||||
GNUSTEP_MAKEFILES=`gnustep-config GNUSTEP_MAKEFILES 2>&5`
|
||||
fi
|
||||
|
||||
if test -z "$GNUSTEP_MAKEFILES"; then
|
||||
AC_MSG_ERROR([You must have the gnustep-make package installed and set up the GNUSTEP_MAKEFILES environment variable to contain the path to the makefiles directory before configuring!])
|
||||
else
|
||||
. $GNUSTEP_MAKEFILES/GNUstep.sh
|
||||
fi
|
||||
|
||||
# This variable might get temporarily overwritten with the
|
||||
|
|
|
|||
Loading…
Reference in a new issue