mirror of
https://github.com/gnustep/libs-gdl2.git
synced 2025-04-22 21:00:44 +00:00
* configure.ac: Replace generation of
EOAdaptors/Postgres95/Makefile.preamble with EOAdaptors/Postgres95/config.mak. * configure: Regenerate. * EOAdaptors/Postgres95/Makefile.postamble: Replace removal of EOAdaptors/Postgres95/Makefile.preamble with EOAdaptors/Postgres95/config.mak. * EOAdaptors/Postgres95/Makefile.preamble: New file replacing... * EOAdaptors/Postgres95/Makefile.preamble.in: ...this file. * EOAdaptors/Postgres95/config.mak.in: New file. * EOAdaptors/Postgres95/LoginPanel/GNUmakefile: Correct comment identifier. Include config.mak and other potential makefiles. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@18783 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
David Ayers
parent
bad9d9d571
commit
f849fd9df3
7 changed files with 95 additions and 38 deletions
17
ChangeLog
17
ChangeLog
|
|
@ -1,3 +1,20 @@
|
|||
2003-03-06 David Ayers <d.ayers@inode.at>
|
||||
|
||||
* configure.ac: Replace generation of
|
||||
EOAdaptors/Postgres95/Makefile.preamble with
|
||||
EOAdaptors/Postgres95/config.mak.
|
||||
* configure: Regenerate.
|
||||
* EOAdaptors/Postgres95/Makefile.postamble: Replace removal of
|
||||
EOAdaptors/Postgres95/Makefile.preamble with
|
||||
EOAdaptors/Postgres95/config.mak.
|
||||
* EOAdaptors/Postgres95/Makefile.preamble: New file replacing...
|
||||
* EOAdaptors/Postgres95/Makefile.preamble.in: ...this file.
|
||||
* EOAdaptors/Postgres95/config.mak.in: New file.
|
||||
|
||||
* EOAdaptors/Postgres95/LoginPanel/GNUmakefile: Correct comment
|
||||
identifier. Include config.mak and other potential makefiles.
|
||||
|
||||
|
||||
2003-03-06 Matt Rice <ratmice@yahoo.com>
|
||||
|
||||
* EOAccess/EOAdaptor.m
|
||||
|
|
|
|||
|
|
@ -1,28 +1,27 @@
|
|||
/** -*-Makefile-*-
|
||||
GNUmakefile
|
||||
|
||||
Copyright (C) 2004 Free Software Foundation, Inc.
|
||||
|
||||
Author: Matt Rice <ratmice@yahoo.com>
|
||||
Date: February 2004
|
||||
|
||||
This file is part of the GNUstep Database Library
|
||||
|
||||
The GNUstep Database Library is free software; you can redistribute it
|
||||
and/or modify it under the terms of the GNU Lesser General Public License
|
||||
as published by the Free Software Foundation; either version 2,
|
||||
or (at your option) any later version.
|
||||
|
||||
The GNUstep Database 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
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with the GNUstep Database Library; see the file COPYING. If not,
|
||||
write to the Free Software Foundation, Inc.,
|
||||
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
# -*-Makefile-*-
|
||||
# GNUmakefile
|
||||
#
|
||||
# Copyright (C) 2004 Free Software Foundation, Inc.
|
||||
#
|
||||
# Author: Matt Rice <ratmice@yahoo.com>
|
||||
# Date: February 2004
|
||||
#
|
||||
# This file is part of the GNUstep Database Library
|
||||
#
|
||||
# The GNUstep Database Library is free software; you can redistribute it
|
||||
# and/or modify it under the terms of the GNU Lesser General Public License
|
||||
# as published by the Free Software Foundation; either version 2,
|
||||
# or (at your option) any later version.
|
||||
#
|
||||
# The GNUstep Database 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
|
||||
# Lesser General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Lesser General Public License
|
||||
# along with the GNUstep Database Library; see the file COPYING. If not,
|
||||
# write to the Free Software Foundation, Inc.,
|
||||
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
|
||||
|
|
@ -32,6 +31,12 @@ LoginPanel_PRINCIPAL_CLASS = Postgres95LoginPanel
|
|||
ADDITIONAL_INCLUDE_DIRS = -I..
|
||||
LoginPanel_COPY_INTO_DIR = ../Postgres95EOAdaptor.framework/Resources
|
||||
|
||||
include ../config.mak
|
||||
|
||||
-include Makefile.preamble
|
||||
|
||||
-include GNUmakefile.local
|
||||
|
||||
ifeq ($(GUI_MAKE_LOADED),yes)
|
||||
include $(GNUSTEP_MAKEFILES)/bundle.make
|
||||
else
|
||||
|
|
@ -43,3 +48,4 @@ else
|
|||
endif
|
||||
endif
|
||||
|
||||
-include Makefile.postamble
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@
|
|||
|
||||
# Things to do after distcleaning
|
||||
after-distclean::
|
||||
rm -rf GNUmakefile Makefile.preamble
|
||||
rm -rf GNUmakefile config.mak
|
||||
|
||||
# Things to do before checking
|
||||
# before-check::
|
||||
|
|
|
|||
|
|
@ -36,25 +36,24 @@
|
|||
#
|
||||
|
||||
# Additional flags to pass to the preprocessor
|
||||
ADDITIONAL_CPPFLAGS =
|
||||
ADDITIONAL_CPPFLAGS +=
|
||||
|
||||
# Additional flags to pass to the Objective-C compiler
|
||||
ADDITIONAL_OBJCFLAGS =
|
||||
ADDITIONAL_OBJCFLAGS +=
|
||||
|
||||
# Additional flags to pass to the C compiler
|
||||
ADDITIONAL_CFLAGS =
|
||||
ADDITIONAL_CFLAGS +=
|
||||
|
||||
# Additional include directories the compiler should search
|
||||
ADDITIONAL_INCLUDE_DIRS = \
|
||||
ADDITIONAL_INCLUDE_DIRS += \
|
||||
-I../../EOControl/$(GNUSTEP_TARGET_DIR) \
|
||||
-I../.. \
|
||||
@POSTGRES_INCLUDES@
|
||||
-I../..
|
||||
|
||||
# Libraries linked to the framework
|
||||
LIBRARIES_DEPEND_UPON = @POSTGRES_LIBS@
|
||||
LIBRARIES_DEPEND_UPON +=
|
||||
|
||||
# Additional library directories the linker should search
|
||||
ADDITIONAL_LIB_DIRS = @POSTGRES_LIB_DIRS@
|
||||
ADDITIONAL_LIB_DIRS +=
|
||||
|
||||
#
|
||||
# Flags dealing with installing and uninstalling
|
||||
|
|
@ -62,3 +61,5 @@ ADDITIONAL_LIB_DIRS = @POSTGRES_LIB_DIRS@
|
|||
|
||||
# Additional directories to be created during installation
|
||||
ADDITIONAL_INSTALL_DIRS =
|
||||
|
||||
include config.mak
|
||||
33
EOAdaptors/Postgres95/config.mak.in
Normal file
33
EOAdaptors/Postgres95/config.mak.in
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
#
|
||||
# config.mak
|
||||
#
|
||||
# Copyright (C) 2004 Free Software Foundation, Inc.
|
||||
#
|
||||
# Author: David Ayers <d.ayers@inode.at>
|
||||
#
|
||||
# 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 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.
|
||||
#
|
||||
|
||||
# Additional include directories the compiler should search
|
||||
ADDITIONAL_INCLUDE_DIRS += @POSTGRES_INCLUDES@
|
||||
|
||||
# Libraries linked to the framework
|
||||
LIBRARIES_DEPEND_UPON += @POSTGRES_LIBS@
|
||||
|
||||
# Additional library directories the linker should search
|
||||
ADDITIONAL_LIB_DIRS += @POSTGRES_LIB_DIRS@
|
||||
|
||||
6
configure
vendored
6
configure
vendored
|
|
@ -2376,7 +2376,7 @@ fi;
|
|||
libs_temp=$LIBS
|
||||
|
||||
CPPFLAGS="$CPPFLAGS -I/usr/local/include -I/usr/local/pgsql/include \
|
||||
-I/usr/include/pgsql"
|
||||
-I/usr/include/pgsql -I/usr/include/postgresql"
|
||||
LIBS="$LIBS -L/usr/local/lib -L/usr/local/pgsql/lib -L/usr/pgsql/lib"
|
||||
|
||||
if test "$pgsql_incdir" != "no"; then
|
||||
|
|
@ -2620,7 +2620,7 @@ echo "${ECHO_T}$VERSION" >&6
|
|||
#--------------------------------------------------------------------
|
||||
# Write the Makefiles
|
||||
#--------------------------------------------------------------------
|
||||
ac_config_files="$ac_config_files gdl2.make EOAdaptors/GNUmakefile EOAdaptors/Postgres95/GNUmakefile EOAdaptors/Postgres95/Makefile.preamble"
|
||||
ac_config_files="$ac_config_files gdl2.make EOAdaptors/GNUmakefile EOAdaptors/Postgres95/GNUmakefile EOAdaptors/Postgres95/config.mak"
|
||||
|
||||
cat >confcache <<\_ACEOF
|
||||
# This file is a shell script that caches the results of configure
|
||||
|
|
@ -3095,7 +3095,7 @@ do
|
|||
"gdl2.make" ) CONFIG_FILES="$CONFIG_FILES gdl2.make" ;;
|
||||
"EOAdaptors/GNUmakefile" ) CONFIG_FILES="$CONFIG_FILES EOAdaptors/GNUmakefile" ;;
|
||||
"EOAdaptors/Postgres95/GNUmakefile" ) CONFIG_FILES="$CONFIG_FILES EOAdaptors/Postgres95/GNUmakefile" ;;
|
||||
"EOAdaptors/Postgres95/Makefile.preamble" ) CONFIG_FILES="$CONFIG_FILES EOAdaptors/Postgres95/Makefile.preamble" ;;
|
||||
"EOAdaptors/Postgres95/config.mak" ) CONFIG_FILES="$CONFIG_FILES EOAdaptors/Postgres95/config.mak" ;;
|
||||
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
|
||||
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
|
||||
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
|
||||
|
|
|
|||
|
|
@ -67,5 +67,5 @@ AC_SUBST(GCC_VERSION)
|
|||
#--------------------------------------------------------------------
|
||||
# Write the Makefiles
|
||||
#--------------------------------------------------------------------
|
||||
AC_CONFIG_FILES([gdl2.make EOAdaptors/GNUmakefile EOAdaptors/Postgres95/GNUmakefile EOAdaptors/Postgres95/Makefile.preamble])
|
||||
AC_CONFIG_FILES([gdl2.make EOAdaptors/GNUmakefile EOAdaptors/Postgres95/GNUmakefile EOAdaptors/Postgres95/config.mak])
|
||||
AC_OUTPUT
|
||||
|
|
|
|||
Loading…
Reference in a new issue