fdo-mirrors/xorg-libx11
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/lib/libx11.git synced 2026-01-02 14:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge the X11 and BIGREQS package sets: they were used in exactly the same places.

Browse source
This commit is contained in:
Jamey Sharp 2006-02-19 02:14:11 +00:00
parent 6b0158dfad
commit 881467b303
13 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
ChangeLog
View file

@ -1,3 +1,20 @@
2006-02-14 Jamey Sharp <jamey@minilop.net>
* 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 <jamey@minilop.net>
* src/XlibInt.c:

6
configure.ac
View file

@ -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)

1
modules/im/ximcp/Makefile.am
View file

@ -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 \

1
modules/lc/Utf8/Makefile.am
View file

@ -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 \

1
modules/lc/def/Makefile.am
View file

@ -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

1
modules/lc/gen/Makefile.am
View file

@ -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

1
modules/lc/xlocale/Makefile.am
View file

@ -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

1
modules/om/generic/Makefile.am
View file

@ -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 \

2
src/Makefile.am
View file

@ -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))

4
src/util/Makefile.am
View file

@ -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 $@

1
src/xcms/Makefile.am
View file

@ -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 \

1
src/xkb/Makefile.am
View file

@ -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 \

1
src/xlibi18n/Makefile.am
View file

@ -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 \