mirror of
https://github.com/gnustep/libs-gdl2.git
synced 2025-04-23 05:00:46 +00:00
Updated all project GNUmakefile's to include the local common.make, which will
attempt to populate GNUSTEP_MAKEFILES by calling gnustep-config. * GNUmakefile.in, EOInterface/GNUmakefile, EOAccess/GNUmakefile, DBModeler/Inspectors/GNUmakefile, DBModeler/GNUmakefile, Tools/GNUmakefile, EOAdaptors/SQLiteAdaptor/LoginPanel/GNUmakefile, EOAdaptors/SQLiteAdaptor/GNUmakefile.in, EOAdaptors/GNUmakefile.in, EOAdaptors/PostgreSQLAdaptor/LoginPanel/GNUmakefile, EOAdaptors/PostgreSQLAdaptor/GNUmakefile.in, EOControl/GNUmakefile, GDL2Palette/GNUmakefile, Documentation/GDL2Intro/GNUmakefile, Documentation/GDL2Intro/Examples/GNUmakefile, Documentation/GNUmakefile, EOModeler/GNUmakefile, common.make Added logic to the local common.make to try to populate GNUSTEP_MAKEFILES by calling gnustep-config, if GNUSTEP_MAKEFILES is not already populated. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@26583 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
313436dd2b
commit
64d9e00095
19 changed files with 69 additions and 45 deletions
15
ChangeLog
15
ChangeLog
|
@ -1,3 +1,18 @@
|
|||
2008-05-29 Blake Nicholson <blaken@umich.edu>
|
||||
|
||||
* GNUmakefile.in, EOInterface/GNUmakefile, EOAccess/GNUmakefile,
|
||||
DBModeler/Inspectors/GNUmakefile, DBModeler/GNUmakefile,
|
||||
Tools/GNUmakefile, EOAdaptors/SQLiteAdaptor/LoginPanel/GNUmakefile,
|
||||
EOAdaptors/SQLiteAdaptor/GNUmakefile.in, EOAdaptors/GNUmakefile.in,
|
||||
EOAdaptors/PostgreSQLAdaptor/LoginPanel/GNUmakefile,
|
||||
EOAdaptors/PostgreSQLAdaptor/GNUmakefile.in, EOControl/GNUmakefile,
|
||||
GDL2Palette/GNUmakefile, Documentation/GDL2Intro/GNUmakefile,
|
||||
Documentation/GDL2Intro/Examples/GNUmakefile,
|
||||
Documentation/GNUmakefile, EOModeler/GNUmakefile, common.make: Added
|
||||
logic to the local common.make to try to populate GNUSTEP_MAKEFILES by
|
||||
calling gnustep-config, if GNUSTEP_MAKEFILES is not already
|
||||
populated.
|
||||
|
||||
2008-05-27 Matt Rice <ratmice@gmail.com>
|
||||
|
||||
* EOInterface/EOPopUpAssociation.m (subjectChanged:): Select
|
||||
|
|
|
@ -23,16 +23,8 @@
|
|||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
#
|
||||
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null)
|
||||
endif
|
||||
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
$(error You need to set GNUSTEP_MAKEFILES before compiling!)
|
||||
endif
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
include ../common.make
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
|
||||
APP_NAME = DBModeler
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
#
|
||||
|
||||
|
||||
include ../../common.make
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
SUBPROJECT_NAME=Inspectors
|
||||
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
include ../../../common.make
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
include $(GNUSTEP_MAKEFILES)/Auxiliary/gdl2.make
|
||||
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
include ../../common.make
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
|
||||
PACKAGE_NAME="GDL2Intro"
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
include ../common.make
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
|
||||
SUBPROJECTS=GDL2Intro
|
||||
|
|
|
@ -23,11 +23,9 @@
|
|||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
#
|
||||
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
|
||||
include ../Version
|
||||
include ../common.make
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
include ../Version
|
||||
|
||||
# The library to be compiled
|
||||
NATIVE_LIBRARY_NAME=EOAccess
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
#
|
||||
|
||||
include ../common.make
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
|
||||
include ../Version
|
||||
|
|
|
@ -23,8 +23,8 @@
|
|||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
#
|
||||
|
||||
include ../../common.make
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
|
||||
include ../../Version
|
||||
|
||||
POSTGRES_DATABASE=@POSTGRES_DATABASE@
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
|
||||
include ../../../common.make
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
|
||||
BUNDLE_NAME=LoginPanel
|
||||
|
@ -52,7 +53,6 @@ LoginPanel_COPY_INTO_DIR = ../PostgreSQLEOAdaptor.framework/Resources
|
|||
include ../config.mak
|
||||
|
||||
-include Makefile.preamble
|
||||
include ../../../common.make
|
||||
|
||||
-include GNUmakefile.local
|
||||
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
# If not, write to the Free Software Foundation, Inc.,
|
||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
#
|
||||
include ../../common.make
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
|
||||
SUBPROJECTS=LoginPanel
|
||||
|
@ -42,7 +43,6 @@ SQLite3EOAdaptor_OBJC_FILES=\
|
|||
SQLite3Expression.m \
|
||||
SQLite3Channel.m
|
||||
|
||||
include ../../common.make
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/aggregate.make
|
||||
include $(GNUSTEP_MAKEFILES)/framework.make
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
# If not, write to the Free Software Foundation, Inc.,
|
||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
include ../../../common.make
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
|
||||
BUNDLE_NAME=LoginPanel
|
||||
|
@ -47,7 +48,6 @@ endif
|
|||
LoginPanel_COPY_INTO_DIR=../SQLite3EOAdaptor.framework/Resources
|
||||
-include ../config.mak
|
||||
-include Makefile.preamable
|
||||
include ../../../common.make
|
||||
-include GNUmakefile.local
|
||||
include $(GNUSTEP_MAKEFILES)/bundle.make
|
||||
-include Makefile.postamble
|
||||
|
|
|
@ -23,11 +23,9 @@
|
|||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
#
|
||||
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
|
||||
include ../Version
|
||||
include ../common.make
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
include ../Version
|
||||
|
||||
# The library to be compiled
|
||||
NATIVE_LIBRARY_NAME=EOControl
|
||||
|
|
|
@ -23,11 +23,9 @@
|
|||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
#
|
||||
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
|
||||
include ../Version
|
||||
include ../common.make
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
include ../Version
|
||||
|
||||
# The library to be compiled
|
||||
NATIVE_LIBRARY_NAME=EOInterface
|
||||
|
|
|
@ -23,11 +23,9 @@
|
|||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
#
|
||||
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
|
||||
include ../Version
|
||||
include ../common.make
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
include ../Version
|
||||
|
||||
# The library to be compiled
|
||||
NATIVE_LIBRARY_NAME=EOModeler
|
||||
|
|
|
@ -24,8 +24,8 @@
|
|||
#
|
||||
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
include ../common.make
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
|
||||
PALETTE_NAME=GDL2
|
||||
GDL2_NEEDS_GUI = yes
|
||||
|
|
|
@ -23,16 +23,8 @@
|
|||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
#
|
||||
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null)
|
||||
endif
|
||||
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
$(error You need to set GNUSTEP_MAKEFILES before compiling!)
|
||||
endif
|
||||
|
||||
include common.make
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
|
||||
include ./Version
|
||||
|
||||
PACKAGE_NAME=gnustep-dl2
|
||||
|
@ -58,7 +50,6 @@ DOCUMENT_NAME = GDL2
|
|||
GDL2_AGSDOC_FILES = GDL2.gsdoc
|
||||
|
||||
-include Makefile.preamble
|
||||
include common.make
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/aggregate.make
|
||||
ifeq ($(doc),yes)
|
||||
|
|
|
@ -23,11 +23,9 @@
|
|||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
#
|
||||
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
|
||||
include ../Version
|
||||
include ../common.make
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
include ../Version
|
||||
|
||||
# The library to be compiled
|
||||
TOOL_NAME=gdlgsdoc eoutil
|
||||
|
|
32
common.make
32
common.make
|
@ -1,3 +1,35 @@
|
|||
#
|
||||
# Common make commands for all GNUmakefile's in gdl2
|
||||
#
|
||||
# Copyright (C) 2006,2007,2008 Free Software Foundation, Inc.
|
||||
#
|
||||
# Written by: Matt Rice <ratmice@gmail.com>
|
||||
#
|
||||
# This file is part of the GNUstep Database 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 3 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; see the file COPYING.LIB.
|
||||
# If not, write to the Free Software Foundation, Inc.,
|
||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
#
|
||||
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null)
|
||||
endif
|
||||
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
$(error You need to set GNUSTEP_MAKEFILES before compiling!)
|
||||
endif
|
||||
|
||||
GDL2_AGSDOC_FLAGS = \
|
||||
-WordMap '{ \
|
||||
|
|
Loading…
Reference in a new issue