From 881467b3032261791ef5ec61b3879bb68d0a3d8c Mon Sep 17 00:00:00 2001 From: Jamey Sharp Date: Sun, 19 Feb 2006 02:14:11 +0000 Subject: Merge the X11 and BIGREQS package sets: they were used in exactly the same places. --- ChangeLog | 17 +++++++++++++++++ configure.ac | 6 +----- modules/im/ximcp/Makefile.am | 1 - modules/lc/Utf8/Makefile.am | 1 - modules/lc/def/Makefile.am | 1 - modules/lc/gen/Makefile.am | 1 - modules/lc/xlocale/Makefile.am | 1 - modules/om/generic/Makefile.am | 1 - src/Makefile.am | 2 -- src/util/Makefile.am | 4 ++-- src/xcms/Makefile.am | 1 - src/xkb/Makefile.am | 1 - src/xlibi18n/Makefile.am | 1 - 13 files changed, 20 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 120123d9..5d46b0dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2006-02-14 Jamey Sharp + + * configure.ac: + * modules/im/ximcp/Makefile.am: + * modules/lc/Utf8/Makefile.am: + * modules/lc/def/Makefile.am: + * modules/lc/gen/Makefile.am: + * modules/lc/xlocale/Makefile.am: + * modules/om/generic/Makefile.am: + * src/Makefile.am: + * src/util/Makefile.am: + * src/xcms/Makefile.am: + * src/xkb/Makefile.am: + * src/xlibi18n/Makefile.am: + Merge the X11 and BIGREQS package sets: they were used in + exactly the same places. + 2006-02-13 Jamey Sharp * src/XlibInt.c: diff --git a/configure.ac b/configure.ac index d21751d7..8b24110d 100644 --- a/configure.ac +++ b/configure.ac @@ -21,14 +21,10 @@ AC_PROG_CC XORG_PROG_RAWCPP # Checks for pkg-config packages -PKG_CHECK_MODULES(BIGREQS, bigreqsproto) -AC_SUBST(BIGREQS_CFLAGS) -AC_SUBST(BIGREQS_LIBS) - PKG_CHECK_MODULES(XPROTO, xproto) AC_SUBST(XPROTO_CFLAGS) -PKG_CHECK_MODULES(X11, xextproto xtrans xau xcmiscproto) +PKG_CHECK_MODULES(X11, xextproto xtrans xau xcmiscproto bigreqsproto) PKG_CHECK_MODULES(XDMCP, xdmcp) AC_SUBST(XDMCP_CFLAGS) diff --git a/modules/im/ximcp/Makefile.am b/modules/im/ximcp/Makefile.am index 3166396b..914ca3ef 100644 --- a/modules/im/ximcp/Makefile.am +++ b/modules/im/ximcp/Makefile.am @@ -7,7 +7,6 @@ AM_CFLAGS= \ -I$(top_srcdir)/src/xkb \ -I$(top_srcdir)/src/xlibi18n \ $(X11_CFLAGS) \ - $(BIGREQS_CFLAGS) \ $(BIGFONT_CFLAGS) \ $(XDMCP_CFLAGS) \ -D_BSD_SOURCE -DXIM_t -DTRANS_CLIENT \ diff --git a/modules/lc/Utf8/Makefile.am b/modules/lc/Utf8/Makefile.am index 0dddc45e..d7b096b5 100644 --- a/modules/lc/Utf8/Makefile.am +++ b/modules/lc/Utf8/Makefile.am @@ -7,7 +7,6 @@ AM_CFLAGS= \ -I$(top_srcdir)/src/xkb \ -I$(top_srcdir)/src/xlibi18n \ $(X11_CFLAGS) \ - $(BIGREQS_CFLAGS) \ $(BIGFONT_CFLAGS) \ $(XDMCP_CFLAGS) \ -D_BSD_SOURCE \ diff --git a/modules/lc/def/Makefile.am b/modules/lc/def/Makefile.am index f417b875..9e9a1a68 100644 --- a/modules/lc/def/Makefile.am +++ b/modules/lc/def/Makefile.am @@ -7,7 +7,6 @@ AM_CFLAGS= \ -I$(top_srcdir)/src/xkb \ -I$(top_srcdir)/src/xlibi18n \ $(X11_CFLAGS) \ - $(BIGREQS_CFLAGS) \ $(BIGFONT_CFLAGS) \ $(XDMCP_CFLAGS) \ -D_BSD_SOURCE diff --git a/modules/lc/gen/Makefile.am b/modules/lc/gen/Makefile.am index cce0cd65..2937cb19 100644 --- a/modules/lc/gen/Makefile.am +++ b/modules/lc/gen/Makefile.am @@ -7,7 +7,6 @@ AM_CFLAGS= \ -I$(top_srcdir)/src/xkb \ -I$(top_srcdir)/src/xlibi18n \ $(X11_CFLAGS) \ - $(BIGREQS_CFLAGS) \ $(BIGFONT_CFLAGS) \ $(XDMCP_CFLAGS) \ -D_BSD_SOURCE diff --git a/modules/lc/xlocale/Makefile.am b/modules/lc/xlocale/Makefile.am index b675a0f6..be8dd41c 100644 --- a/modules/lc/xlocale/Makefile.am +++ b/modules/lc/xlocale/Makefile.am @@ -7,7 +7,6 @@ AM_CFLAGS= \ -I$(top_srcdir)/src/xkb \ -I$(top_srcdir)/src/xlibi18n \ $(X11_CFLAGS) \ - $(BIGREQS_CFLAGS) \ $(BIGFONT_CFLAGS) \ $(XDMCP_CFLAGS) \ -D_BSD_SOURCE diff --git a/modules/om/generic/Makefile.am b/modules/om/generic/Makefile.am index 23caa0c7..043ee606 100644 --- a/modules/om/generic/Makefile.am +++ b/modules/om/generic/Makefile.am @@ -8,7 +8,6 @@ AM_CFLAGS= \ -I$(top_srcdir)/src/xlibi18n \ -I$(top_srcdir)/src \ $(X11_CFLAGS) \ - $(BIGREQS_CFLAGS) \ $(BIGFONT_CFLAGS) \ $(XDMCP_CFLAGS) \ -D_BSD_SOURCE \ diff --git a/src/Makefile.am b/src/Makefile.am index a155df13..3af2d674 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -14,7 +14,6 @@ AM_CFLAGS= \ -I$(top_srcdir)/src/xkb \ -I$(top_srcdir)/src/xlibi18n \ $(X11_CFLAGS) \ - $(BIGREQS_CFLAGS) \ $(BIGFONT_CFLAGS) \ $(XDMCP_CFLAGS) \ -D_BSD_SOURCE -DX11_t -DTRANS_CLIENT \ @@ -363,7 +362,6 @@ libX11_la_LIBADD = \ $(USE_XCMS_LIBS) \ $(USE_XKB_LIBS) \ $(X11_LIBS) \ - $(BIGREQS_LIBS) \ $(XDMCP_LIBS) preprocess: $(patsubst %.c,%.ii,$(libX11_la_SOURCES)) diff --git a/src/util/Makefile.am b/src/util/Makefile.am index b4160500..72c97758 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -1,8 +1,8 @@ -# $XdotOrg: lib/X11/src/util/Makefile.am,v 1.3 2005-10-07 15:00:01 kem Exp $ +# $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $ noinst_PROGRAMS=makekeys -makekeys_CFLAGS=$(X11_CFLAGS) $(BIGREQS_CFLAGS) +makekeys_CFLAGS=$(X11_CFLAGS) #override CC = gcc LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ diff --git a/src/xcms/Makefile.am b/src/xcms/Makefile.am index 3300aba9..2251acb7 100644 --- a/src/xcms/Makefile.am +++ b/src/xcms/Makefile.am @@ -10,7 +10,6 @@ AM_CFLAGS= \ -I$(top_srcdir)/src/xlibi18n \ -I$(top_srcdir)/src \ $(X11_CFLAGS) \ - $(BIGREQS_CFLAGS) \ $(BIGFONT_CFLAGS) \ $(XDMCP_CFLAGS) \ -D_BSD_SOURCE \ diff --git a/src/xkb/Makefile.am b/src/xkb/Makefile.am index c33b80e1..896a0995 100644 --- a/src/xkb/Makefile.am +++ b/src/xkb/Makefile.am @@ -7,7 +7,6 @@ AM_CFLAGS= \ -I$(top_srcdir)/src/xkb \ -I$(top_srcdir)/src/xlibi18n \ $(X11_CFLAGS) \ - $(BIGREQS_CFLAGS) \ $(BIGFONT_CFLAGS) \ $(XDMCP_CFLAGS) \ -D_BSD_SOURCE \ diff --git a/src/xlibi18n/Makefile.am b/src/xlibi18n/Makefile.am index 28b9f1a5..284ff63d 100644 --- a/src/xlibi18n/Makefile.am +++ b/src/xlibi18n/Makefile.am @@ -8,7 +8,6 @@ AM_CFLAGS= \ -I$(top_srcdir)/src/xlibi18n \ -I$(top_srcdir)/src \ $(X11_CFLAGS) \ - $(BIGREQS_CFLAGS) \ $(BIGFONT_CFLAGS) \ $(XDMCP_CFLAGS) \ -D_BSD_SOURCE \ -- cgit v1.2.1