gnustep/libs-gdl2
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gdl2.git synced 2025-04-22 21:00:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* GNUmakefile: Build EOControl before EOAccess.

Browse source 
* EOAccess/GNUmakefile: Remove LIBRARIES_DEPEND_UPON handling.
        * EOControl/GNUmakefile: Ditto.
        * EOModeler/GNUmakefile: Ditto.
        * Tools/GNUmakefile: Ditto.
        * EOAccess/Makefile.preamble: Correct LIBRARIES_DEPEND_UPON
        handling.
        * EOControl/Makefile.preamble: Ditto.
        * EOModeler/Makefile.preamble: Ditto.
        * Tools/Makefile.preamble: Ditto.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@18509 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
David Ayers 2004-01-30 14:02:24 +00:00
parent dbab457576
commit f62dee1f23
10 changed files with 35 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,16 @@
2003-01-30 David Ayers <d.ayers@inode.at>
* GNUmakefile: Build EOControl before EOAccess.
* EOAccess/GNUmakefile: Remove LIBRARIES_DEPEND_UPON handling.
* EOControl/GNUmakefile: Ditto.
* EOModeler/GNUmakefile: Ditto.
* Tools/GNUmakefile: Ditto.
* EOAccess/Makefile.preamble: Correct LIBRARIES_DEPEND_UPON
handling.
* EOControl/Makefile.preamble: Ditto.
* EOModeler/Makefile.preamble: Ditto.
* Tools/Makefile.preamble: Ditto.
2003-01-29 David Ayers <d.ayers@inode.at>
* EOAccess/GNUmakefile: Test FOUNDATION_LIB to determine whether

8
EOAccess/GNUmakefile
View file

@ -32,14 +32,6 @@ include ../Version
# The library to be compiled
LIBRARY_NAME=libgnustep-db2
ifeq ($(FOUNDATION_LIB),gnu)
LIBRARIES_DEPEND_UPON = -lgnustep-base
else
LIBRARIES_DEPEND_UPON = -lgnustep-baseadd
endif
LIBRARIES_DEPEND_UPON += -lgnustep-db2control
# The C source files to be compiled
libgnustep-db2_C_FILES =

8
EOAccess/Makefile.preamble
View file

@ -51,7 +51,7 @@ ADDITIONAL_INCLUDE_DIRS = -I..
ADDITIONAL_LDFLAGS =
# Additional library directories the linker should search
ADDITIONAL_LIB_DIRS =
ADDITIONAL_LIB_DIRS = -L../EOControl/$(GNUSTEP_OBJ_DIR)
#
# Flags dealing with installing and uninstalling
@ -65,7 +65,13 @@ ADDITIONAL_INSTALL_DIRS =
# systems where building a shared library requires to pass to the linker
# all the libraries the target library depends upon.
ifneq ($(FOUNDATION_LIBRARY_NAME),)
LIBRARIES_DEPEND_UPON = -l$(FOUNDATION_LIBRARY_NAME)
endif
ifneq ($(FOUNDATION_LIB),gnu)
LIBRARIES_DEPEND_UPON += -lgnustep-baseadd
endif
LIBRARIES_DEPEND_UPON += -lgnustep-db2control
ifeq ($(FOUNDATION_HAS_KVC), yes)
ADDITIONAL_OBJCFLAGS := $(ADDITIONAL_OBJCFLAGS) -DFOUNDATION_HAS_KVC=1

6
EOControl/GNUmakefile
View file

@ -32,12 +32,6 @@ include ../Version
# The library to be compiled
LIBRARY_NAME=libgnustep-db2control
ifeq ((FOUNDATION_LIB),gnu)
libgnustep-db2control_LIBRARIES_DEPEND_UPON = -lgnustep-base
else
libgnustep-db2control_LIBRARIES_DEPEND_UPON = -lgnustep-baseadd
endif
# The C source files to be compiled
libgnustep-db2control_C_FILES =

5
EOControl/Makefile.preamble
View file

@ -65,7 +65,12 @@ ADDITIONAL_INSTALL_DIRS =
# systems where building a shared library requires to pass to the linker
# all the libraries the target library depends upon.
ifneq ($(FOUNDATION_LIBRARY_NAME),)
LIBRARIES_DEPEND_UPON = -l$(FOUNDATION_LIBRARY_NAME)
endif
ifneq ($(FOUNDATION_LIB),gnu)
LIBRARIES_DEPEND_UPON += -lgnustep-baseadd
endif
ifeq ($(FOUNDATION_HAS_KVC), yes)
ADDITIONAL_OBJCFLAGS := $(ADDITIONAL_OBJCFLAGS) -DFOUNDATION_HAS_KVC=1

6
EOModeler/GNUmakefile
View file

@ -32,12 +32,6 @@ include ../Version
# The library to be compiled
LIBRARY_NAME=libgnustep-db2modeler
ifeq ((FOUNDATION_LIB),gnu)
libgnustep-db2modeler_LIBRARIES_DEPEND_UPON = -lgnustep-base
else
libgnustep-db2modeler_LIBRARIES_DEPEND_UPON = -lgnustep-baseadd
endif
# The C source files to be compiled
libgnustep-db2modeler_C_FILES =

8
EOModeler/Makefile.preamble
View file

@ -51,7 +51,7 @@ ADDITIONAL_INCLUDE_DIRS = -I..
ADDITIONAL_LDFLAGS =
# Additional library directories the linker should search
ADDITIONAL_LIB_DIRS =
ADDITIONAL_LIB_DIRS = -L../EOControl/$(GNUSTEP_OBJ_DIR) -L../EOAccess/$(GNUSTEP_OBJ_DIR)
#
# Flags dealing with installing and uninstalling
@ -65,4 +65,10 @@ ADDITIONAL_INSTALL_DIRS =
# systems where building a shared library requires to pass to the linker
# all the libraries the target library depends upon.
ifneq ($(FOUNDATION_LIBRARY_NAME),)
LIBRARIES_DEPEND_UPON = -l$(FOUNDATION_LIBRARY_NAME)
endif
ifneq ($(FOUNDATION_LIB),gnu)
LIBRARIES_DEPEND_UPON += -lgnustep-baseadd
endif
LIBRARIES_DEPEND_UPON += -lgnustep-db2control -lgnustep-db2

2
GNUmakefile
View file

@ -29,7 +29,7 @@ include ./Version
#
# The list of subproject directories
#
SUBPROJECTS = EOAccess EOControl EOAdaptors EOModeler Tools
SUBPROJECTS = EOControl EOAccess EOAdaptors EOModeler Tools
-include Makefile.preamble

8
Tools/GNUmakefile
View file

@ -32,14 +32,6 @@ include ../Version
# The library to be compiled
TOOL_NAME=gdlgsdoc eoutil
ifeq ((FOUNDATION_LIB),gnu)
LIBRARIES_DEPEND_UPON = -lgnustep-base
else
LIBRARIES_DEPEND_UPON = -lgnustep-baseadd
endif
LIBRARIES_DEPEND_UPON += -lgnustep-db2control -lgnustep-db2
# The C source files to be compiled
gdlgsdoc_C_FILES =

2
Tools/Makefile.preamble
View file

@ -66,7 +66,9 @@ ADDITIONAL_INSTALL_DIRS =
# systems where building a shared library requires to pass to the linker
# all the libraries the target library depends upon.
ifneq ($(FOUNDATION_LIBRARY_NAME),)
LIBRARIES_DEPEND_UPON = -l$(FOUNDATION_LIBRARY_NAME)
endif
ifeq ($(FOUNDATION_HAS_KVC), yes)
ADDITIONAL_OBJCFLAGS := $(ADDITIONAL_OBJCFLAGS) -DFOUNDATION_HAS_KVC=1