Package: zen Version: 0.2.2 Author: Guillem Jover Status: applied Description: Switched to automake 1.7 and autoconf 2.73. Removed user definable variables from Makefile.am files. configure.in, acinclude.m4: - added proper brackets (maybe abused ;). - changed obsolete macros. Removed acconfig.h file deprecated by configure.in. Removed not needed stamp-h.in file. Moved config scripts dir to $src_top_dir/config dir, for config.{guess,sub}, install-sh etc. clean the source top dir. autogen.sh: - do not run configure. - added warning and forcing stuff. - create $src_top_dir/config dir. Removed auto-generated files (install-sh missing mkinstalldirs), they are created by the autogen.sh script. Index: acinclude.m4 =================================================================== RCS file: /usr/local/cvsroot/zen/acinclude.m4,v retrieving revision 1.7 diff -u -a -u -r1.7 acinclude.m4 --- acinclude.m4 2 May 2001 18:01:52 -0000 1.7 +++ acinclude.m4 12 Sep 2003 04:10:47 -0000 @@ -10,7 +10,7 @@ if (test "${$3_$1}" = "yes" && test "$3" = "enable") || (test "${$3_$1}" = "no" && test "$3" = "disable") then - AC_CHECK_LIB($1, $2, $5, $6) + AC_CHECK_LIB([$1], [$2], [$5], [$6]) fi ]) @@ -41,8 +41,8 @@ fi AC_PATH_PROG(MAGICK_CONFIG, Magick-config, no) - min_Magick_version=ifelse([$1], ,4.0.0,$1) - AC_MSG_CHECKING(for Magick - version >= $min_Magick_version) + min_Magick_version=ifelse([$1], ,[4.0.0],[$1]) + AC_MSG_CHECKING([for Magick - version >= $min_Magick_version]) no_Magick="" if test "$MAGICK_CONFIG" = "no" ; then no_Magick=yes @@ -103,7 +103,7 @@ if test x$with_Magick = x ; then dnl Look for separately installed Magick - ZEN_PATH_MAGICK($2, ifelse([$3], , :, [$3]), + ZEN_PATH_MAGICK([$2], [ifelse([$3], , :, [$3])], [ifelse([$4], , AC_MSG_ERROR([ *** libMagick $2 or better is required. The latest version of libMagick Index: autogen.sh =================================================================== RCS file: /usr/local/cvsroot/zen/autogen.sh,v retrieving revision 1.3 diff -u -a -u -r1.3 autogen.sh --- autogen.sh 7 May 2000 14:30:08 -0000 1.3 +++ autogen.sh 12 Sep 2003 04:10:47 -0000 @@ -59,7 +59,8 @@ fi echo -n "Running aclocal with options '$ACLOCAL_FLAGS'... " -aclocal $ACLOCAL_FLAGS +[ -d config ] || mkdir config +aclocal -I config $ACLOCAL_FLAGS if test $? -ne 0; then echo; echo "aclocal failed."; exit 1; fi echo "done" @@ -70,27 +71,24 @@ # optionally feature autoheader echo -n "Running autoheader... " -autoheader +autoheader -Wall -f if test $? -ne 0; then echo; echo "autoheader failed."; exit 1; fi echo "done" echo -n "Running automake... " -automake -a +automake -Wall -a -f if test $? -ne 0; then echo; echo "automake failed."; exit 1; fi echo "done" echo -n "Running autoconf... " -autoconf +autoconf -f if test $? -ne 0; then echo; echo "autoconf failed."; exit 1; fi echo "done" cd $ORIGDIR -$srcdir/configure "$@" -if test $? -ne 0; then echo; echo "configure failed."; exit 1; fi - if test $? -eq 0 then echo - echo "Now type 'make' to compile $PROJECT." -fi \ No newline at end of file + echo "Now type 'configure' and 'make' to compile $PROJECT." +fi Index: configure.in =================================================================== RCS file: /usr/local/cvsroot/zen/configure.in,v retrieving revision 1.54 diff -u -a -u -r1.54 configure.in --- configure.in 5 Jun 2003 08:19:54 -0000 1.54 +++ configure.in 12 Sep 2003 04:10:48 -0000 @@ -1,34 +1,35 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(src/main.c, 2.13) - -PACKAGE=zen -VERSION=0.2.2 +AC_INIT([zen], [0.2.2]) +AC_PREREQ([2.57]) +AC_CONFIG_SRCDIR([src/main.c]) +AC_CONFIG_AUX_DIR(config) dnl Check system type -AC_CANONICAL_SYSTEM +AC_CANONICAL_TARGET([]) -AM_INIT_AUTOMAKE($PACKAGE, $VERSION) -AM_CONFIG_HEADER(config.h) +AM_INIT_AUTOMAKE([foreign 1.7]) +AM_MAINTAINER_MODE +AC_CONFIG_HEADERS([config.h]) dnl Provide debugging possibilities, otherwise optimise. OPTIMISE_CFLAGS="-O2 -g" WARNING_CFLAGS="-Wall -Werror" -AC_ARG_ENABLE(debug, +AC_ARG_ENABLE([debug], [ --enable-debug Compile with debug information], - [AC_DEFINE(DEBUG)]) + [AC_DEFINE([DEBUG], 1, [Define if debugging was enabled.])]) dnl Provide test coverage possibility. This is a gcc specific option. -AC_ARG_ENABLE(test-coverage, +AC_ARG_ENABLE([test-coverage], [ --enable-test-coverage Compile with gcov test coverage support Only usable with gcc. Imply debugging.], [PROFILE_CFLAGS="-fprofile-arcs -ftest-coverage" OPTIMISE_CFLAGS="-g" - AC_DEFINE(DEBUG)]) + AC_DEFINE([DEBUG], 1, [Define if debugging was enabled.])]) dnl Profiling does not work with shared libraries, so until I dnl fix Zen to compile statically, this will not be available dnl for the interfaces, but only for the main program. -AC_ARG_ENABLE(profile, +AC_ARG_ENABLE([profile], [ --enable-profile Compile with profiling debug information], [PROFILE_CFLAGS="-pg" WARNING_CFLAGS="-Wall"]) @@ -36,14 +37,15 @@ dnl Checks for programs. AC_PROG_CC AC_PROG_INSTALL -AC_CHECK_TOOL(RANLIB, ranlib, :) dnl Check if compiler supports -Wno-strict-aliasing -AC_MSG_CHECKING(whether the C compiler accepts -Wno-strict-aliasing) +AC_MSG_CHECKING([whether the C compiler accepts -Wno-strict-aliasing]) OLD_CFLAGS="$CFLAGS" CFLAGS="-Wno-strict-aliasing" -AC_TRY_COMPILE(, , [WARNING_CFLAGS="$WARNING_CFLAGS -Wno-strict-aliasing" - AC_MSG_RESULT(yes)], AC_MSG_RESULT(no)) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])], + [WARNING_CFLAGS="$WARNING_CFLAGS -Wno-strict-aliasing" + AC_MSG_RESULT(yes)], + [AC_MSG_RESULT(no)]) CFLAGS="$OLD_CFLAGS" AC_SUBST(WARNING_CFLAGS) @@ -59,23 +61,24 @@ dnl Checks for header files. AC_HEADER_STDC -AC_CHECK_HEADERS(getopt.h pthread.h strings.h) +AC_CHECK_HEADERS([getopt.h pthread.h strings.h]) dnl Checks for typedefs, structures, and compiler characteristics. dnl This is not a good check, because the types short and int are dnl not specified to the correct sizes. dnl Better checking will be made later. -AC_CHECK_HEADER(inttypes.h, AC_DEFINE(HAVE_INTTYPES_H), -[AC_CHECK_TYPE(uint8_t, unsigned char) - AC_CHECK_TYPE(uint16_t, unsigned short) - AC_CHECK_TYPE(uint32_t, unsigned int)]) +AC_CHECK_HEADER([inttypes.h], + AC_DEFINE([HAVE_INTTYPES_H], 1, [Define if you have the inttypes.h header file.]), + [AC_CHECK_TYPE(uint8_t, [unsigned char]) + AC_CHECK_TYPE(uint16_t, [unsigned short]) + AC_CHECK_TYPE(uint32_t, [unsigned int])]) AC_C_BIGENDIAN dnl Checks for library functions. -AC_CHECK_FUNCS(getopt getopt_long) +AC_CHECK_FUNCS([getopt getopt_long]) dnl Check for libtool. -AM_PROG_LIBTOOL +AC_PROG_LIBTOOL dnl Used for debugging purposes. dnl Make sure only one of these are being used. @@ -84,7 +87,7 @@ if test "x$ac_cv_lib_dmallocth_main" != "x" then DEBUG_LIBS="-ldmallocth" - AC_CHECK_HEADERS(dmalloc.h) + AC_CHECK_HEADERS([dmalloc.h]) fi if test "x${DEBUG_LIBS}" = "x" then @@ -106,28 +109,28 @@ fi dnl Checks for special network libraries. -AC_CHECK_FUNCS(socket, , AC_CHECK_LIB(socket, socket)) -AC_CHECK_FUNCS(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname)) +AC_CHECK_FUNCS(socket, , [AC_CHECK_LIB(socket, socket)]) +AC_CHECK_FUNCS(gethostbyname, , [AC_CHECK_LIB(nsl, gethostbyname)]) dnl Checks for libraries. -AC_CHECK_FUNCS(dlopen, , AC_CHECK_LIB(dl,dlopen, , +AC_CHECK_FUNCS(dlopen, , [AC_CHECK_LIB(dl,dlopen, , [AC_MSG_ERROR([ -*** Zen does not function properly without dlopen.])])) +*** Zen does not function properly without dlopen.])])]) AC_CHECK_LIB(pthread,pthread_create, , [AC_MSG_ERROR([ *** Zen does not function properly without libpthread, sorry.])]) dnl Is this pthread library GNU pth? (GNU pth is non-preemptive) AC_CACHE_CHECK([whether pthread is GNU pth],[zen_cv_lib_pth], - AC_EGREP_CPP(wehavegnupth,[ + [AC_EGREP_CPP(wehavegnupth,[ #include #ifdef _POSIX_THREAD_IS_GNU_PTH wehavegnupth -#endif],zen_cv_lib_pth=yes,zen_cv_lib_pth=no)) +#endif],zen_cv_lib_pth=yes,zen_cv_lib_pth=no)]) if test "x${zen_cv_lib_pth}" = "xyes" then - AC_DEFINE(HAVE_GNU_PTH) + AC_DEFINE([HAVE_GNU_PTH], 1, [Define if pthread library is GNU pth.]) fi dnl Check for image processing libraries. @@ -137,13 +140,15 @@ [ Do not use the JPEG decoding library], [AVAILABLE_IMAGE="${AVAILABLE_IMAGE} libjpeg" LIBS="${LIBS} -ljpeg" - AC_DEFINE(HAVE_LIBJPEG)]) + AC_DEFINE([HAVE_LIBJPEG], 1, + [Define if you have the jpeg library '-ljpeg'.])]) ZEN_OPTIONAL_CHECK_LIB(png, png_read_row, disable, [ Do not use the PNG decoding library], [AVAILABLE_IMAGE="${AVAILABLE_IMAGE} libpng" LIBS="${LIBS} -lpng" - AC_DEFINE(HAVE_LIBPNG)]) + AC_DEFINE([HAVE_LIBPNG], 1, + [Define if you have the png library '-lpng'.])]) dnl We have two options here, to use the libungif library, or to dnl use the giflib library. We prefer libungif, because it is the @@ -152,12 +157,14 @@ [ Do not use the GIF decoding library], [AVAILABLE_IMAGE="${AVAILABLE_IMAGE} libungif" LIBS="${LIBS} -lungif" - AC_DEFINE(HAVE_LIBUNGIF)], + AC_DEFINE([HAVE_LIBUNGIF], 1, + [Define if you have the ungif library '-lungif'.])], [ZEN_OPTIONAL_CHECK_LIB(gif, DGifOpenFileHandle, disable, [ Do not use the GIF decoding and encoding library], [AVAILABLE_IMAGE="${AVAILABLE_IMAGE} libgif" LIBS="${LIBS} -lgif" - AC_DEFINE(HAVE_LIBGIF)])]) + AC_DEFINE([HAVE_LIBGIF], 1, + [Define if you have the gif library '-lgif'.])])]) old_CPPFLAGS=${CPPFLAGS} @@ -169,13 +176,14 @@ magick_force="force" fi -ZEN_CHECK_LIBMAGICK(${magick_force}, , +ZEN_CHECK_LIBMAGICK([${magick_force}], , [AVAILABLE_IMAGE="${AVAILABLE_IMAGE} libMagick" - AC_DEFINE(HAVE_LIBMAGICK) - AC_CHECK_HEADERS(magick/api.h, , - [AC_CHECK_HEADERS(magick/magick.h, , - [AC_CHECK_HEADERS(magick.h)])])], - [AC_MSG_WARN(libMagick will not be used for image processing.)]) + AC_DEFINE([HAVE_LIBMAGICK], 1, + [Define if you have the Magick library '-lMagick'.]) + AC_CHECK_HEADERS([magick/api.h], , + [AC_CHECK_HEADERS([magick/magick.h], , + [AC_CHECK_HEADERS([magick.h])])])], + AC_MSG_WARN([libMagick will not be used for image processing.])) AC_SUBST(MAGICK_CFLAGS) CPPFLAGS=${old_CPPFLAGS} @@ -199,26 +207,27 @@ old_CFLAGS=${CFLAGS} LIBS= -ifdef([AM_CHECK_LIBOFBIS], - [AM_CHECK_LIBOFBIS(0.1.0, , - [AC_MSG_WARN([oFBis user interface will not be used.])])], - [AC_MSG_WARN([oFBis user interface will not be used.])]) +m4_ifdef([AM_CHECK_LIBOFBIS], + [AM_CHECK_LIBOFBIS([0.1.0], , + AC_MSG_WARN([oFBis user interface will not be used.]))], + AC_MSG_WARN([oFBis user interface not available will not be used.])) LIBS= CFLAGS=${old_CFLAGS} -ifdef([AM_PATH_GLIB], - [AM_PATH_GLIB(1.2.0)], - gthread) +m4_ifdef([AM_PATH_GLIB], + [AM_PATH_GLIB([1.2.0], , + AC_MSG_WARN([GLIB will not be used.]), gthread)], + AC_MSG_WARN([GLIB not available will not be used.])) CFLAGS="${CFLAGS} ${GLIB_CFLAGS}" LIBS="${LIBS} ${GLIB_LIBS}" -ifdef([AM_PATH_GTK], - [AM_PATH_GTK(1.2.0, , - [AC_MSG_WARN([GTK+ user interface will not be used.])], - gthread)], - [AC_MSG_WARN([GTK+ user interface will not be used.])]) +m4_ifdef([AM_PATH_GTK], + [AM_PATH_GTK([1.2.0], , + AC_MSG_WARN([GTK+ user interface will not be used.]), + gthread)], + AC_MSG_WARN([GTK+ user interface not available will not be used.])) LIBS= CFLAGS=${old_CFLAGS} @@ -228,16 +237,15 @@ Compile the curses interface, experimental], [ AC_CHECK_LIB(curses, initscr, , - AC_CHECK_LIB(ncurses, initscr)) -AC_CHECK_HEADER(curses.h, , AC_CHECK_HEADER(ncurses.h)) + [AC_CHECK_LIB(ncurses, initscr)]) +AC_CHECK_HEADER([curses.h], , [AC_CHECK_HEADER([ncurses.h])]) CURSES_LIBS=${LIBS} ]) AC_ARG_ENABLE(psdump-interface, [ --disable-psdump-interface Do not compile the PostScript dump interface], - USE_PSDUMP=${enableval} - , + USE_PSDUMP=${enableval}, USE_PSDUMP=yes ) @@ -281,14 +289,14 @@ dnl Print out some information about how the compilation will dnl be performed. -AC_MSG_CHECKING(which interfaces that will be used) +AC_MSG_CHECKING([which interfaces that will be used]) if test "x${AVAILABLE_UI}" != "x" then AC_MSG_RESULT(${AVAILABLE_UI}) else AC_MSG_RESULT(none) fi -AC_MSG_CHECKING(which image handlers that will be used) +AC_MSG_CHECKING([which image handlers that will be used]) if test "x${AVAILABLE_IMAGE}" != "x" then AC_MSG_RESULT(${AVAILABLE_IMAGE}) @@ -296,10 +304,10 @@ AC_MSG_RESULT(none) fi -AC_MSG_CHECKING(which compiling flags that will be used) +AC_MSG_CHECKING([which compiling flags that will be used]) AC_MSG_RESULT(${WARNING_CFLAGS} ${OPTIMISE_CFLAGS} ${PROFILE_CFLAGS}) -AC_MSG_CHECKING(which debugging library that will be used) +AC_MSG_CHECKING([which debugging library that will be used]) if test "x${DEBUG_LIBS}" != "x" then AC_MSG_RESULT(${DEBUG_LIBS}) @@ -307,20 +315,23 @@ AC_MSG_RESULT(none) fi -AC_OUTPUT( \ - Makefile \ - src/Makefile \ - src/common/Makefile \ - src/ui/Makefile \ - src/ui/dump/Makefile \ - src/ui/ofbis/Makefile \ - src/ui/gtk/Makefile \ - src/ui/curses/Makefile \ - src/ui/psdump/Makefile \ - src/ui/progress_logo/Makefile \ - src/parser/Makefile \ - src/layouter/Makefile \ - src/protocol/Makefile \ - src/image/Makefile \ - doc/Makefile \ -) +AC_CONFIG_FILES([ + Makefile + src/Makefile + src/common/Makefile + src/ui/Makefile + src/ui/dump/Makefile + src/ui/ofbis/Makefile + src/ui/gtk/Makefile + src/ui/curses/Makefile + src/ui/psdump/Makefile + src/ui/progress_logo/Makefile + src/parser/Makefile + src/layouter/Makefile + src/protocol/Makefile + src/image/Makefile + doc/Makefile +]) + +AC_OUTPUT + Index: src/Makefile.am =================================================================== RCS file: /usr/local/cvsroot/zen/src/Makefile.am,v retrieving revision 1.19 diff -u -a -u -r1.19 Makefile.am --- src/Makefile.am 15 Jul 2002 12:37:18 -0000 1.19 +++ src/Makefile.am 12 Sep 2003 04:10:48 -0000 @@ -1,8 +1,6 @@ SUBDIRS = common ui parser protocol layouter image -CFLAGS = @WARNING_CFLAGS@ @OPTIMISE_CFLAGS@ @PROFILE_CFLAGS@ - -INCLUDES = -I. -I.. -Iparser -Ilayouter -Iui -Iprotocol +AM_CPPFLAGS = -I. -I.. -Iparser -Ilayouter -Iui -Iprotocol DEFS = @DEFS@ -DAVAILABLE_UI="\"@AVAILABLE_UI@\"" Index: src/common/Makefile.am =================================================================== RCS file: /usr/local/cvsroot/zen/src/common/Makefile.am,v retrieving revision 1.1 diff -u -a -u -r1.1 Makefile.am --- src/common/Makefile.am 5 Apr 2001 20:34:56 -0000 1.1 +++ src/common/Makefile.am 12 Sep 2003 04:10:48 -0000 @@ -1,6 +1,4 @@ -CFLAGS = @WARNING_CFLAGS@ @OPTIMISE_CFLAGS@ @PROFILE_CFLAGS@ - -INCLUDES = -I.. +AM_CPPFLAGS = -I.. noinst_LIBRARIES = libcommon.a Index: src/image/Makefile.am =================================================================== RCS file: /usr/local/cvsroot/zen/src/image/Makefile.am,v retrieving revision 1.12 diff -u -a -u -r1.12 Makefile.am --- src/image/Makefile.am 22 Mar 2001 20:32:14 -0000 1.12 +++ src/image/Makefile.am 12 Sep 2003 04:10:48 -0000 @@ -1,7 +1,7 @@ -CFLAGS = @WARNING_CFLAGS@ @OPTIMISE_CFLAGS@ @PROFILE_CFLAGS@ @MAGICK_CFLAGS@ +AM_CFLAGS = @MAGICK_CFLAGS@ # Later, the imagemagick include directory will be found in configure. -INCLUDES = -I.. -I../protocol -I../ui -I../layouter +AM_CPPFLAGS = -I.. -I../protocol -I../ui -I../layouter noinst_LIBRARIES = libimage.a Index: src/layouter/Makefile.am =================================================================== RCS file: /usr/local/cvsroot/zen/src/layouter/Makefile.am,v retrieving revision 1.12 diff -u -a -u -r1.12 Makefile.am --- src/layouter/Makefile.am 22 Mar 2001 20:32:17 -0000 1.12 +++ src/layouter/Makefile.am 12 Sep 2003 04:10:48 -0000 @@ -1,6 +1,4 @@ -CFLAGS = @WARNING_CFLAGS@ @OPTIMISE_CFLAGS@ @PROFILE_CFLAGS@ - -INCLUDES = -I.. -I../ui -I../parser -I../protocol -I../image +AM_CPPFLAGS = -I.. -I../ui -I../parser -I../protocol -I../image noinst_LIBRARIES = liblayouter.a Index: src/parser/Makefile.am =================================================================== RCS file: /usr/local/cvsroot/zen/src/parser/Makefile.am,v retrieving revision 1.13 diff -u -a -u -r1.13 Makefile.am --- src/parser/Makefile.am 22 Mar 2001 20:32:19 -0000 1.13 +++ src/parser/Makefile.am 12 Sep 2003 04:10:48 -0000 @@ -1,6 +1,4 @@ -CFLAGS = @WARNING_CFLAGS@ @OPTIMISE_CFLAGS@ @PROFILE_CFLAGS@ - -INCLUDES = -I.. -I../layouter -I../ui -I../image +AM_CPPFLAGS = -I.. -I../layouter -I../ui -I../image noinst_LIBRARIES = libparser.a Index: src/protocol/Makefile.am =================================================================== RCS file: /usr/local/cvsroot/zen/src/protocol/Makefile.am,v retrieving revision 1.9 diff -u -a -u -r1.9 Makefile.am --- src/protocol/Makefile.am 5 Apr 2001 20:38:07 -0000 1.9 +++ src/protocol/Makefile.am 12 Sep 2003 04:10:48 -0000 @@ -1,6 +1,4 @@ -CFLAGS = @WARNING_CFLAGS@ @OPTIMISE_CFLAGS@ @PROFILE_CFLAGS@ - -INCLUDES = -I.. -I../common -I../ui -I../layouter +AM_CPPFLAGS = -I.. -I../common -I../ui -I../layouter noinst_LIBRARIES = libprotocol.a Index: src/ui/Makefile.am =================================================================== RCS file: /usr/local/cvsroot/zen/src/ui/Makefile.am,v retrieving revision 1.18 diff -u -a -u -r1.18 Makefile.am --- src/ui/Makefile.am 15 Jul 2002 12:37:20 -0000 1.18 +++ src/ui/Makefile.am 12 Sep 2003 04:10:48 -0000 @@ -3,9 +3,7 @@ # This is needed to ensure these are added when creating the distribution. EXTRA_SUBDIRS = dump ofbis gtk curses psdump -CFLAGS = @WARNING_CFLAGS@ @OPTIMISE_CFLAGS@ @PROFILE_CFLAGS@ - -INCLUDES = -I../.. -I.. -I../layouter +AM_CPPFLAGS = -I../.. -I.. -I../layouter noinst_LIBRARIES = libui.a Index: src/ui/curses/Makefile.am =================================================================== RCS file: /usr/local/cvsroot/zen/src/ui/curses/Makefile.am,v retrieving revision 1.1 diff -u -a -u -r1.1 Makefile.am --- src/ui/curses/Makefile.am 29 Apr 2001 09:43:40 -0000 1.1 +++ src/ui/curses/Makefile.am 12 Sep 2003 04:10:48 -0000 @@ -1,6 +1,4 @@ -CFLAGS = @WARNING_CFLAGS@ @OPTIMISE_CFLAGS@ - -INCLUDES = -I.. -I../.. -I../../layouter +AM_CPPFLAGS = -I.. -I../.. -I../../layouter # Prevent any other library to link into this one. # But we want to link the debug library into this. Maybe not. Index: src/ui/dump/Makefile.am =================================================================== RCS file: /usr/local/cvsroot/zen/src/ui/dump/Makefile.am,v retrieving revision 1.10 diff -u -a -u -r1.10 Makefile.am --- src/ui/dump/Makefile.am 16 Jan 2001 09:31:17 -0000 1.10 +++ src/ui/dump/Makefile.am 12 Sep 2003 04:10:48 -0000 @@ -1,6 +1,4 @@ -CFLAGS = @WARNING_CFLAGS@ @OPTIMISE_CFLAGS@ - -INCLUDES = -I.. -I../.. -I../../layouter +AM_CPPFLAGS = -I.. -I../.. -I../../layouter # Prevent any other library to link into this one. LIBS = Index: src/ui/gtk/Makefile.am =================================================================== RCS file: /usr/local/cvsroot/zen/src/ui/gtk/Makefile.am,v retrieving revision 1.12 diff -u -a -u -r1.12 Makefile.am --- src/ui/gtk/Makefile.am 21 Apr 2001 13:12:54 -0000 1.12 +++ src/ui/gtk/Makefile.am 12 Sep 2003 04:10:48 -0000 @@ -1,6 +1,4 @@ -CFLAGS = @WARNING_CFLAGS@ @OPTIMISE_CFLAGS@ - -INCLUDES = -I.. -I../.. -I../../layouter -I../progress_logo @GTK_CFLAGS@ +AM_CPPFLAGS = -I.. -I../.. -I../../layouter -I../progress_logo @GTK_CFLAGS@ # Prevent any other library to link into this one. # But we want to link the debug library into this. Maybe not. Index: src/ui/ofbis/Makefile.am =================================================================== RCS file: /usr/local/cvsroot/zen/src/ui/ofbis/Makefile.am,v retrieving revision 1.10 diff -u -a -u -r1.10 Makefile.am --- src/ui/ofbis/Makefile.am 16 Jan 2001 09:31:20 -0000 1.10 +++ src/ui/ofbis/Makefile.am 12 Sep 2003 04:10:48 -0000 @@ -1,6 +1,4 @@ -CFLAGS = @WARNING_CFLAGS@ @OPTIMISE_CFLAGS@ - -INCLUDES = -I.. -I../.. -I../../layouter @OFBIS_CFLAGS@ +AM_CPPFLAGS = -I.. -I../.. -I../../layouter @OFBIS_CFLAGS@ # Prevent any other library to link into this one. LIBS = Index: src/ui/progress_logo/Makefile.am =================================================================== RCS file: /usr/local/cvsroot/zen/src/ui/progress_logo/Makefile.am,v retrieving revision 1.3 diff -u -a -u -r1.3 Makefile.am --- src/ui/progress_logo/Makefile.am 15 Dec 2000 22:38:12 -0000 1.3 +++ src/ui/progress_logo/Makefile.am 12 Sep 2003 04:10:48 -0000 @@ -1,6 +1,4 @@ -CFLAGS = @WARNING_CFLAGS@ @OPTIMISE_CFLAGS@ - -INCLUDES = +AM_CPPFLAGS = # Prevent any other library to link into this one. LIBS = Index: src/ui/psdump/Makefile.am =================================================================== RCS file: /usr/local/cvsroot/zen/src/ui/psdump/Makefile.am,v retrieving revision 1.1 diff -u -a -u -r1.1 Makefile.am --- src/ui/psdump/Makefile.am 15 Jul 2002 12:37:24 -0000 1.1 +++ src/ui/psdump/Makefile.am 12 Sep 2003 04:10:48 -0000 @@ -1,6 +1,4 @@ -CFLAGS = @WARNING_CFLAGS@ @OPTIMISE_CFLAGS@ - -INCLUDES = -I.. -I../.. -I../../layouter +AM_CPPFLAGS = -I.. -I../.. -I../../layouter # Prevent any other library to link into this one. LIBS = @@ -12,8 +10,7 @@ psdump_init.c psdump_open.c psdump_close.c \ psdump_text.c psdump_image.c psdump_line.c \ version.h info.h -# psdump_title.c psdump_table.c \ - +# psdump_title.c psdump_table.c libzen_ui_psdump_la_LDFLAGS = -version-info 0:1:0