Attachment #87489 for bug #133819

Lines 672-678 Link Here

(-)gtk+-1.2.10/acinclude.m4.orig (-1 / +1 lines)
672	AC_DEFINE(HAVE_STPCPY)	672	AC_DEFINE(HAVE_STPCPY)
673	fi	673	fi
674		674
675	AM_LC_MESSAGES	675	gt_LC_MESSAGES
676	AM_GTK_WITH_NLS	676	AM_GTK_WITH_NLS
677		677
678	if test "x$CATOBJEXT" != "x"; then	678	if test "x$CATOBJEXT" != "x"; then

Lines 1-6 Link Here

(-)gtk+-1.2.10/gtk.m4.orig (-1 / +6 lines)
1	# Configure paths for GTK+	1	# Configure paths for GTK+
2	# Owen Taylor 97-11-3	2	# Owen Taylor 97-11-3
3		3	AC_DEFUN([GTK_AC_DIVERT_BEFORE_HELP],
		4	[ifdef([m4_divert_text], [m4_divert_text([NOTICE],[$1])],
		5	[ifdef([AC_DIVERT], [AC_DIVERT([NOTICE],[$1])],
		6	[AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
		7	$1
		8	AC_DIVERT_POP()])])])
4	dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])	9	dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
5	dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS	10	dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
6	dnl	11	dnl




builtin(include,gtk.m4)


# Process this file with autoconf to produce a configure script.
AC_INIT(gdk/gdktypes.h)

# In the following, there are a the following variants
# of GLib cflags and libs variables
#

# glib_thread_cflags: cflags to store in gtk-config for gtk-config gthread
# glib_thread_libs:   libs to store in gtk-config for gtk-config gthread

AC_CANONICAL_TARGET
# Save this value here, since automake will set cflags later
cflags_set=${CFLAGS+set}

GTK_AC_DIVERT_BEFORE_HELP([
dnl are available for $ac_help expansion (don't we all *love* autoconf?)
AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
#
# Making releases:
#   GTK_MICRO_VERSION += 1;

GTK_MICRO_VERSION=10
GTK_INTERFACE_AGE=1
GTK_BINARY_AGE=10
GTK_VERSION="$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION"
])
AC_DIVERT_POP()dnl

AC_SUBST(GTK_MAJOR_VERSION)
AC_SUBST(GTK_MINOR_VERSION)

AC_SUBST(GTK_VERSION)

# libtool versioning
LT_RELEASE="$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION"
LT_CURRENT=`expr $GTK_MICRO_VERSION - $GTK_INTERFACE_AGE`
LT_REVISION="$GTK_INTERFACE_AGE"
LT_AGE=`expr $GTK_BINARY_AGE - $GTK_INTERFACE_AGE`
AC_SUBST(LT_RELEASE)
AC_SUBST(LT_CURRENT)

AC_SUBST(LT_AGE)

# For automake.
VERSION="$GTK_VERSION"
PACKAGE="gtk+"

# Save this value here, since automake will set cflags later
cflags_set=${CFLAGS+set}

dnl Initialize automake stuff
AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)

AM_CONFIG_HEADER(config.h)

dnl Initialize libtool
AC_PROG_LIBTOOL

dnl Initialize maintainer mode
AM_MAINTAINER_MODE

AC_CANONICAL_HOST

dnl figure debugging default, prior to $ac_help setup

GTK_AC_DIVERT_BEFORE_HELP([
if test `expr $GTK_MINOR_VERSION \% 2` = 1 ; then
  debug_default="yes"
else
  debug_default="minimum"
fi
])

dnl declare --enable-* args and collect ac_help strings
AC_ARG_ENABLE(debug, [  --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],,
  [enable_debug="$debug_default"])
AC_ARG_ENABLE(shm, [  --enable-shm            support shared memory if available [default=yes]],
  [echo "$enable_shm"],[enable_shm="yes"])
AC_ARG_ENABLE(ansi, [  --enable-ansi           turn on strict ansi [default=no]],,[enable_ansi="no"])
		    , enable_ansi=no)
AC_ARG_WITH(glib, [  --with-glib=DIR         Use uninstalled copy of glib])
AC_ARG_ENABLE(xim, [  --enable-xim            support XIM [default=yes]],,[enable_xim="yes"])
AC_ARG_ENABLE(xim_inst, [  --disable-xim-inst      does not use xim instantiate callback],,
  [enable_xim_inst="maybe"])
AC_ARG_ENABLE(rebuilds, [  --disable-rebuilds      disable all source autogeneration rules],,
  [enable_rebuilds="yes"])
AC_ARG_WITH(locale, [  --with-locale=LOCALE    locale name you want to use ])

AC_ARG_WITH(xinput, [  --with-xinput=[no/gxi/xfree] support XInput ])
AC_ARG_WITH(native_locale, [  --with-native-locale=[yes/no] Use native locale support [default=no]],,
  [with_native_locale="no"])


if test "x$enable_debug" = "xyes"; then
  test "$cflags_set" = "set" || CFLAGS="$CFLAGS -g"
  GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG"
else
  if test "x$enable_debug" = "xno"; then

fi

AC_DEFINE_UNQUOTED(GTK_COMPILED_WITH_DEBUGGING, "${enable_debug}")

# Build time sanity check...
AM_SANITY_CHECK

# Checks for programs.
AC_PROG_CC
AC_ISC_POSIX
AC_PROG_CC_STDC
AC_PROG_INSTALL
AC_PROG_MAKE_SET

changequote(,)dnl
if test "x$GCC" = "xyes"; then

  fi
fi
changequote([,])dnl

# Honor aclocal flags
ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"


AC_CHECK_PROG(INDENT, indent, indent)

REBUILD=\#
if test "x$enable_rebuilds" = "xyes" && test -n "$PERL" && \
     test -n "$PERL" && \
     $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 && \
     test -n "$AWK" ; then
  REBUILD=


dnl Check for nl_langinfo and CODESET
AC_MSG_CHECKING([for nl_langinfo (CODESET)])
AC_TRY_COMPILE([#include <langinfo.h>
  ],
        [char *codeset = nl_langinfo (CODESET);],
   AC_DEFINE(HAVE_CODESET,1,[Have nl_langinfo (CODESET)])
  have_codeset="yes",
  have_codeset="no"
)
AC_MSG_RESULT($have_codeset)

dnl The DU4 header files don't provide library prototypes unless 
dnl -std1 is given to the native cc.
AC_MSG_CHECKING([for extra flags to get ANSI library prototypes])

gtk_save_LIBS="$LIBS"
LIBS="$LIBS -lm"
AC_TRY_RUN([#include <math.h>
             int main (void) { return (log(1) != log(1.)); }],
     AC_MSG_RESULT(none needed),
  [gtk_save_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS -std1"
     AC_TRY_RUN([#include <math.h>
	         int main (void) { return (log(1) != log(1.)); }],
         AC_MSG_RESULT(-std1),
         AC_MSG_RESULT()
    CFLAGS="$gtk_save_CFLAGS"
    AC_MSG_WARN([No ANSI prototypes found in library. (-std1 didn't work.)]),
  true)],
	 true
     ),
     AC_MSG_RESULT(none needed)
)
LIBS="$gtk_save_LIBS"

dnl NeXTStep cc seems to need this
AC_MSG_CHECKING([for extra flags for POSIX compliance])
AC_TRY_COMPILE([#include <dirent.h>
  ],[DIR *dir;],
  AC_MSG_RESULT(none needed),
  [gtk_save_CFLAGS="$CFLAGS"
  CFLAGS="$CFLAGS -posix"
  AC_TRY_COMPILE([#include <dirent.h>
    ],[DIR *dir;],
    AC_MSG_RESULT(-posix),
    AC_MSG_RESULT()
    CFLAGS="$gtk_save_CFLAGS"
    AC_MSG_WARN([Could not determine POSIX flag. (-posix didn't work.)])]))



if test "x$with_glib" = "xyes" ; then
  AC_MSG_ERROR([*** Directory must be specified for --with-glib])
fi

if test "x$with_glib" = "x" ; then 
  # Look for separately installed glib

  AM_PATH_GLIB(1.2.8,,

else
  # Use uninstalled glib (assume they got the version right)

  GLIB_CONFIG="$with_glib/glib-config"
  if test -x $GLIB_CONFIG ; then 
    :
  else

  glib_release=`$GLIB_CONFIG --version | sed 's%\\.[[0-9]]*$%%'`

  # canonicalize relative paths
  case "$with_glib" in 
    /*)
      glib_dir="$with_glib"
      ;;
    *)
      glib_dir="\$(top_builddir)/$with_glib"

saved_ldflags="$LDFLAGS"

CFLAGS="$CFLAGS $X_CFLAGS"
LDFLAGS="$LDFLAGS $X_LDFLAGS" 

if test "x$no_x" = "xyes"; then 
  AC_MSG_ERROR([
*** X libraries or include files not found. Check 'config.log' for 
*** more details.])
fi

# Checks for libraries.
# Check for the X11 library
AC_CHECK_LIB(X11,XOpenDisplay,
  x_libs="-lX11 $X_EXTRA_LIBS", 
  AC_MSG_ERROR([*** libX11 not found. Check 'config.log' for more details.]),
  $X_EXTRA_LIBS
)
if test "x$enable_shm" = "xyes"; then
  # Check for the Xext library (needed for XShm extention)
  AC_CHECK_LIB(Xext, XShmAttach, 
      x_libs="-lXext $x_libs", 
      # On AIX, it is in XextSam instead, but we still need -lXext
      [AC_CHECK_LIB(XextSam, XShmAttach, 
          x_libs="-lXextSam -lXext $x_libs", 
          no_xext_lib="yes",
          $x_libs
      )],
      $x_libs
  )
fi

# Check for shaped window extension

AC_CHECK_LIB(Xext, XShapeCombineMask,
  if test -z "`echo $x_libs | grep \-lXext 2> /dev/null`"; then
           x_libs="-lXext $x_libs"
      fi
  AC_DEFINE(HAVE_SHAPE_EXT),,
  $x_libs
)

# Check for XConvertCase (X11R6 specific)

AC_CHECK_LIB(X11, XConvertCase,
  AC_DEFINE(HAVE_XCONVERTCASE),,
  $x_libs
)

# Check for XIM support.
AC_CHECK_LIB(X11, XUnregisterIMInstantiateCallback,,
AC_CHECK_LIB(X11, XUnregisterIMInstantiateCallback,
	    : ,
	    enable_xim_inst="no",
  $x_libs
)
# On Solaris, calling XRegisterIMInstantiateCallback seems to
# cause an immediate segfault, so we disable it, unless
# the user specifically forces it to be on.
if test "x$enable_xim_inst" = "xmaybe" ; then
  case "$host" in
  case host in
	*-*-solaris*)
            enable_xim_inst="no"
            ;;

fi

x_cflags="$X_CFLAGS"
x_ldflags="$X_LDFLAGS" 

# set up things for XInput

if test "x$with_xinput" = "xgxi"; then
  AC_MSG_WARN([
*** The generic XInput support has not been tested for several years
*** and is not known to work with any currently available X servers])
  AC_DEFINE(XINPUT_GXI)
  xinput_progs="gxid"
  x_libs="-lXi $x_libs"
elif test "x$with_xinput" = "xxfree" || test "x$with_xinput" = "xyes"; then
  AC_DEFINE(XINPUT_XFREE)


if test "x$enable_shm" = "xyes"; then
  # Check for shared memory
  AC_CHECK_HEADER(sys/ipc.h, AC_DEFINE(HAVE_IPC_H), no_sys_ipc="yes")
  AC_CHECK_HEADER(sys/shm.h, AC_DEFINE(HAVE_SHM_H), no_sys_shm="yes")

  # Check for the X shared memory extension header file
  AC_MSG_CHECKING(X11/extensions/XShm.h)
  if test "x$no_xext_lib" = "xyes"; then
    AC_MSG_RESULT(no)
    no_xshm="yes"
  else
    if test -f "$x_includes/X11/extensions/XShm.h"; then
      AC_MSG_RESULT(yes)
      AC_DEFINE(HAVE_XSHM_H)
    else
      AC_MSG_RESULT(no)
      no_xshm="yes"
    fi
  fi
fi

# Check if X_LOCALE definition is necessary

AC_MSG_CHECKING(need -DX_LOCALE)

AC_TRY_RUN([
#include <stdio.h>
#include <locale.h>
  int main ()
int
main ()
{
  return setlocale (LC_ALL, "${with_locale}") == NULL;
}],
  need_x_locale="no",
  need_x_locale="yes",
  need_x_locale="no"
)
AC_MSG_RESULT($need_x_locale)

use_native_locale="no"
if test "$need_x_locale" = "yes"; then
  GTK_LOCALE_FLAGS="-DX_LOCALE"
else
  if test "x$with_native_locale" = "xyes" ; then
    AC_MSG_CHECKING(functioning locale support)
  
    AC_TRY_COMPILE([#include <stdlib.h>],
      [char c;
          if (MB_CUR_MAX == 1) {
              wctomb(&c, 42);
      }],
      use_native_locale="yes"
    )
    AC_MSG_RESULT($use_native_locale)
  fi
fi

if test "x$use_native_locale" = "xyes" ; then
  AC_MSG_CHECKING(if sizeof(wchar_t) == 4)

  AC_TRY_RUN([#include <stdlib.h>
    int main ()

  int
  main ()
  {
    return (sizeof(wchar_t) == 4) ? 0 : 1;
    }],,
    use_native_locale="no"
  )
  AC_MSG_RESULT($use_native_locale)
fi

if test "$use_native_locale" = "yes" ; then 
  AC_DEFINE(USE_NATIVE_LOCALE)
fi



# Check if <sys/select.h> needs to be included for fd_set
AC_MSG_CHECKING([for fd_set])
AC_TRY_COMPILE([#include <sys/types.h>
  ],
  [fd_set readMask, writeMask;],
  gtk_ok="yes",
  gtk_ok="no"
)
if test "$gtk_ok" = "yes"; then
    AC_MSG_RESULT([yes, found in sys/types.h])
else
  AC_HEADER_EGREP(fd_mask, sys/select.h, gtk_ok="yes")
  if test "$gtk_ok" = "yes"; then
        AC_DEFINE(HAVE_SYS_SELECT_H)
        AC_MSG_RESULT([yes, found in sys/select.h])
    else

# Duplicate `widechar' tests from `glib'.
# Check for wchar.h
AC_MSG_CHECKING(for wchar.h)
AC_TRY_CPP([#include <wchar.h>
  ],
  gtk_ok="yes",
  gtk_ok="no"
)
if test "$gtk_ok" = "yes"; then
   AC_DEFINE(HAVE_WCHAR_H,1,[Define if wchar.h exists])
fi
AC_MSG_RESULT($gtk_ok)

# Check for wctype.h (for iswalnum)
AC_MSG_CHECKING(for wctype.h)
AC_TRY_CPP([#include <wctype.h>], gtk_ok="yes", gtk_ok="no")
if test "$gtk_ok" = "yes"; then
   AC_DEFINE(HAVE_WCTYPE_H,1,[Define if wctype.h exists])
fi
AC_MSG_RESULT($gtk_ok)

# in Solaris 2.5, `iswalnum' is in -lw
GDK_WLIBS=
AC_CHECK_FUNC(iswalnum,,[AC_CHECK_LIB(w,iswalnum,GDK_WLIBS="-lw")])

# The following is necessary for Linux libc-5.4.38
oLIBS="$LIBS"
LIBS="$LIBS $GDK_WLIBS"
AC_MSG_CHECKING(if iswalnum() and friends are properly defined)
AC_TRY_LINK([#include <stdlib.h>
  ],
  [#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H))
#  ifdef HAVE_WCTYPE_H
#    include <wctype.h>
#  else

#else
#  define iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c))
#endif
  iswalnum((wchar_t) 0);],
  gtk_ok="yes",
  gtk_ok="no"
)
LIBS="$oLIBS"

if test "$gtk_ok" = "no"; then
   AC_DEFINE(HAVE_BROKEN_WCTYPE,1,[Define if the wctype function is broken])
   GDK_WLIBS=
fi

gtk/Makefile
gtk/gtkfeatures.h
gdk.pc
gtk+.pc],
[chmod +x gtk-config])




	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
	-release $(LT_RELEASE) \
	-export-dynamic \
	@GLIB_DEPLIBS@	\
	@x_ldflags@	\
	@x_libs@	\
	-lm		\
@STRIP_END@

libgdk_la_LIBADD = @GLIB_DEPLIBS@ @x_libs@ -lm

#
# setup source file variables
#

EXTRA_PROGRAMS = gxid
bin_PROGRAMS = @xinput_progs@
LDADDS = @STRIP_BEGIN@ \
	@x_ldflags@	\
	@x_libs@	\
	@GLIB_LIBS@	\
	-lm		\
@STRIP_END@
gxid_SOURCES = gxid.c
gxid_LDADD = $(LDADDS)
gxid_LDFLAGS = @x_ldflags@

.PHONY: files


Lines 27-39 Link Here

(-)gtk+-1.2.10/gtk/Makefile.am.orig (-13 / +25 lines)
27	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \	27	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
28	-release $(LT_RELEASE) \	28	-release $(LT_RELEASE) \
29	-export-dynamic \	29	-export-dynamic \
30	@GLIB_DEPLIBS@ \
31	@x_ldflags@ \	30	@x_ldflags@ \
32	@x_libs@ \
33	-lm \
34	@STRIP_END@	31	@STRIP_END@
35	# $(top_builddir)/gdk/libgdk.la	32	libgtk_la_LIBADD = @STRIP_BEGIN@ \
36		33	$(top_builddir)/gdk/libgdk.la \
		34	@x_libs@ \
		35	@GDK_WLIBS@ \
		36	@GLIB_LIBS@ \
		37	-lm \
		38	@STRIP_END@
37		39
38	#	40	#
39	# setup source file variables	41	# setup source file variables
Lines 374-387 Link Here
374		376
375		377
376	gtkconfdir = $(sysconfdir)/gtk	378	gtkconfdir = $(sysconfdir)/gtk
377	gtkconf_DATA = gtkrc.az gtkrc.he gtkrc.hy gtkrc.ja \	379	# removed references to non-existent gtkrc files - tsh
		380	gtkconf_DATA = \
		381	gtkrc.az gtkrc.he gtkrc.hy gtkrc.ja \
378	gtkrc.ko gtkrc.ru gtkrc.th gtkrc.uk \	382	gtkrc.ko gtkrc.ru gtkrc.th gtkrc.uk \
379	gtkrc.utf-8 gtkrc.iso-8859-2 \	383	gtkrc.iso-8859-2 gtkrc.iso-8859-5 \
380	gtkrc.iso-8859-3 gtkrc.iso-8859-5 gtkrc.iso-8859-7 \	384	gtkrc.iso-8859-13 gtkrc.iso-8859-14 \
381	gtkrc.iso-8859-9 gtkrc.iso-8859-13 gtkrc.iso-8859-14 \	385	gtkrc.iso-8859-15 gtkrc.zh_TW.big5 \
382	gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW.big5 \	386	gtkrc.zh_CN gtkrc.cp1251 gtkrc.cp1255 \
383	gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps \	387	gtkrc.ka_GE.georgianacademy \
384	gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii gtkrc.cp1251 gtkrc.cp1255	388	gtkrc.ka_GE.georgianps \
		389	gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii
385		390
386	# We create a dummy theme for the default GTK+ theme	391	# We create a dummy theme for the default GTK+ theme
387	install-data-local:	392	install-data-local:
Lines 428-434 Link Here
428	LDADDS = @STRIP_BEGIN@ \	433	LDADDS = @STRIP_BEGIN@ \
429	libgtk.la \	434	libgtk.la \
430	$(top_builddir)/gdk/libgdk.la \	435	$(top_builddir)/gdk/libgdk.la \
431	@x_ldflags@ \
432	@x_libs@ \	436	@x_libs@ \
433	@GDK_WLIBS@ \	437	@GDK_WLIBS@ \
434	@GLIB_LIBS@ \	438	@GLIB_LIBS@ \
Lines 441-452 Link Here
441	testdnd_DEPENDENCIES = $(DEPS)	445	testdnd_DEPENDENCIES = $(DEPS)
442	simple_DEPENDENCIES = $(DEPS)	446	simple_DEPENDENCIES = $(DEPS)
443	#testthreads_DEPENDENCIES = $(DEPS)	447	#testthreads_DEPENDENCIES = $(DEPS)
		448
444	testgtk_LDADD = $(LDADDS)	449	testgtk_LDADD = $(LDADDS)
		450	testgtk_LDFLAGS=@x_ldflags@
445	testinput_LDADD = $(LDADDS)	451	testinput_LDADD = $(LDADDS)
		452	testinput_LDFLAGS = @x_ldflags@
446	testselection_LDADD = $(LDADDS)	453	testselection_LDADD = $(LDADDS)
		454	testselection_LDFLAGS = @x_ldflags@
447	testrgb_LDADD = $(LDADDS)	455	testrgb_LDADD = $(LDADDS)
		456	testrgb_LDFLAGS = @x_ldflags@
448	testdnd_LDADD = $(LDADDS)	457	testdnd_LDADD = $(LDADDS)
		458	testdnd_LDFLAGS = @x_ldflags@
449	simple_LDADD = $(LDADDS)	459	simple_LDADD = $(LDADDS)
		460	simple_LDFLAGS = @x_ldflags@
		461
450	#testthreads_LDADD = $(LDADDS)	462	#testthreads_LDADD = $(LDADDS)
451		463
452	.PHONY: files test test-debug	464	.PHONY: files test test-debug

Return to bug 133819

Lines 21-32 Link Here

(-)gtk+-1.2.10/gdk/Makefile.am.orig (-5 / +3 lines)
21	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \	21	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
22	-release $(LT_RELEASE) \	22	-release $(LT_RELEASE) \
23	-export-dynamic \	23	-export-dynamic \
24	@GLIB_DEPLIBS@ \
25	@x_ldflags@ \	24	@x_ldflags@ \
26	@x_libs@ \
27	-lm \
28	@STRIP_END@	25	@STRIP_END@
29		26
		27	libgdk_la_LIBADD = @GLIB_DEPLIBS@ @x_libs@ -lm
		28
30	#	29	#
31	# setup source file variables	30	# setup source file variables
32	#	31	#
Lines 104-117 Link Here
104	EXTRA_PROGRAMS = gxid	103	EXTRA_PROGRAMS = gxid
105	bin_PROGRAMS = @xinput_progs@	104	bin_PROGRAMS = @xinput_progs@
106	LDADDS = @STRIP_BEGIN@ \	105	LDADDS = @STRIP_BEGIN@ \
107	@x_ldflags@ \
108	@x_libs@ \	106	@x_libs@ \
109	@GLIB_LIBS@ \	107	@GLIB_LIBS@ \
110	-lm \	108	-lm \
111	@STRIP_END@	109	@STRIP_END@
112	gxid_SOURCES = gxid.c	110	gxid_SOURCES = gxid.c
113	gxid_LDADD = $(LDADDS)	111	gxid_LDADD = $(LDADDS)
114		112	gxid_LDFLAGS = @x_ldflags@
115		113
116	.PHONY: files	114	.PHONY: files
117		115