frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update pkgconfig files to separate library build-time dependencies from 

application build-time dependencies, and update package deps to work
    with separate build roots.
This commit is contained in:
Kevin E Martin 2005-11-19 07:15:50 +00:00
parent d3b6653a28
commit 63aa96c08a
9 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
* GL/glx/Makefile.am:
* Xprint/Makefile.am:
* Xprint/pcl/Makefile.am:
* Xprint/ps/Makefile.am:
* Xprint/raster/Makefile.am:
* configure.ac:
* hw/xfree86/utils/xorgconfig/Makefile.am:
* xorg-server.pc.in:
Update dependencies to work with separate build roots.
2005-11-18 Adam Jackson <ajax@freedesktop.org> 2005-11-18 Adam Jackson <ajax@freedesktop.org>
* hw/xfree86/os-support/linux/Makefile.am: * hw/xfree86/os-support/linux/Makefile.am:

2
GL/glx/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libglx.la noinst_LTLIBRARIES = libglx.la
AM_CFLAGS = @DIX_CFLAGS@ @GL_CFLAGS@ -I@MESA_SOURCE@/include AM_CFLAGS = @DIX_CFLAGS@ @GL_CFLAGS@ @XLIB_CFLAGS@ -I@MESA_SOURCE@/include -DXFree86Server
# none yet # none yet
#sdk_HEADERS = #sdk_HEADERS =

2
Xprint/Makefile.am
View File

@ -2,7 +2,7 @@ SUBDIRS = doc pcl raster ps etc
bin_PROGRAMS = Xprt bin_PROGRAMS = Xprt
Xprt_CFLAGS = @DIX_CFLAGS@ -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_ -DXPRINTDIR=\"$(prefix)/X11/xserver\" Xprt_CFLAGS = @DIX_CFLAGS@ @XPRINT_CFLAGS@ -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_ -DXPRINTDIR=\"$(prefix)/X11/xserver\"
Xprt_LDFLAGS = -L$(top_srcdir) Xprt_LDFLAGS = -L$(top_srcdir)
Xprt_LDADD = @XPRINT_LIBS@ pcl/libpcl.la raster/libraster.la Xprt_LDADD = @XPRINT_LIBS@ pcl/libpcl.la raster/libraster.la

2
Xprint/pcl/Makefile.am
View File

@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libpcl.la
INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
AM_CFLAGS = @DIX_CFLAGS@ -D_XP_PRINT_SERVER_ -DPSZ=8 AM_CFLAGS = @DIX_CFLAGS@ @XPRINT_CFLAGS@ -D_XP_PRINT_SERVER_ -DPSZ=8
libpcl_la_SOURCES = \ libpcl_la_SOURCES = \
PclArc.c \ PclArc.c \

2
Xprint/ps/Makefile.am
View File

@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libps.la
INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
AM_CFLAGS = @DIX_CFLAGS@ -D_XP_PRINT_SERVER_ -DPSZ=8 -DXP_PSTEXT AM_CFLAGS = @DIX_CFLAGS@ @XPRINT_CFLAGS@ -D_XP_PRINT_SERVER_ -DPSZ=8 -DXP_PSTEXT
libps_la_SOURCES = \ libps_la_SOURCES = \
PsArc.c \ PsArc.c \

2
Xprint/raster/Makefile.am
View File

@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libraster.la
INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
AM_CFLAGS = @DIX_CFLAGS@ -D_XP_PRINT_SERVER_ -DPSZ=8 AM_CFLAGS = @DIX_CFLAGS@ @XPRINT_CFLAGS@ -D_XP_PRINT_SERVER_ -DPSZ=8
libraster_la_SOURCES = \ libraster_la_SOURCES = \
RasterAttVal.c \ RasterAttVal.c \

15
configure.ac
View File

@ -511,6 +511,8 @@ if test "x$RES" = xyes; then
fi fi
if test "x$GLX" = xyes && ! test "x$MESA_SOURCE" = x; then if test "x$GLX" = xyes && ! test "x$MESA_SOURCE" = x; then
PKG_CHECK_MODULES([XLIB], [x11])
AC_SUBST(XLIB_CFLAGS)
AC_DEFINE(GLXEXT, 1, [Build GLX extension]) AC_DEFINE(GLXEXT, 1, [Build GLX extension])
GLX_LIBS='$(top_builddir)/GL/glx/libglx.la $(top_builddir)/GL/mesa/libGLcore.la' GLX_LIBS='$(top_builddir)/GL/glx/libglx.la $(top_builddir)/GL/mesa/libGLcore.la'
test -d GL || mkdir GL test -d GL || mkdir GL
@ -1000,6 +1002,11 @@ if test "x$XORG" = xyes; then
AC_SUBST([XORG_CFLAGS]) AC_SUBST([XORG_CFLAGS])
AC_SUBST([LD_EXPORT_SYMBOLS_FLAG]) AC_SUBST([LD_EXPORT_SYMBOLS_FLAG])
dnl Module defines are used in the Xorg server and the drivers
dnl Note that this is used in xorg-server.pc.in
MODULE_DEFINES="-DIN_MODULE -DXFree86Module"
AC_SUBST([MODULE_DEFINES])
dnl these only go in xorg-config.h dnl these only go in xorg-config.h
XF86CONFIGFILE="xorg.conf" XF86CONFIGFILE="xorg.conf"
CONFIGFILE="$sysconfdir/$XF86CONFIGFILE" CONFIGFILE="$sysconfdir/$XF86CONFIGFILE"
@ -1055,8 +1062,8 @@ AC_MSG_RESULT([$XPRINT])
if test "x$XPRINT" = xyes; then if test "x$XPRINT" = xyes; then
PKG_CHECK_MODULES([XPRINT], [printproto x11 xfont $XDMCP_MODULES xau]) PKG_CHECK_MODULES([XPRINT], [printproto x11 xfont $XDMCP_MODULES xau])
XPRINT_EXTENSIONS="$XEXT_LIB $DBE_LIB $XTRAP_LIB $RENDER_LIB $COMPOSITE_LIB $RANDR_LIB $XI_LIB $FIXES_LIB $LBX_LIB $DAMAGE_LIB $XI_LIB $GLX_LIBS" XPRINT_EXTENSIONS="$XEXT_LIB $DBE_LIB $XTRAP_LIB $RENDER_LIB $COMPOSITE_LIB $RANDR_LIB $XI_LIB $FIXES_LIB $LBX_LIB $DAMAGE_LIB $XI_LIB $GLX_LIBS"
XPRINT_INCLUDES="$XEXT_INC $RENDER_INC $COMPOSITE_INC $RANDR_INC $XI_INC $FIXES_INC $DAMAGE_INC $XI_INC $GLX_INC $LBX_INC" XPRINT_LIBS="$XPRINT_LIBS $DIX_LIB $XKB_LIB $XKB_STUB_LIB $OS_LIB $XPRINT_EXTENSIONS $MI_LIB $MIEXT_DAMAGE_LIB"
XPRINT_LIBS="$XPRINT_LIBS $DIX_LIB $XKB_LIB $XKB_STUB_LIB $OS_LIB $XPRINT_EXTENSIONS $MI_LIB $MIEXT_DAMAGE_LIB $GLX_INC" AC_SUBST([XPRINT_CFLAGS])
AC_SUBST([XPRINT_LIBS]) AC_SUBST([XPRINT_LIBS])
xpconfigdir=$libdir/X11/xserver xpconfigdir=$libdir/X11/xserver
@ -1177,7 +1184,9 @@ esac
AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix]) AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix])
dnl xorgconfig CLI configuration utility dnl xorgconfig CLI configuration utility
PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile]) PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11])
AC_SUBST(XORGCONFIG_DEP_CFLAGS)
AC_SUBST(XORGCONFIG_DEP_LIBS)
dnl xorgcfg GUI configuration utility dnl xorgcfg GUI configuration utility
AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg], AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg],

4
hw/xfree86/utils/xorgconfig/Makefile.am
View File

@ -31,13 +31,13 @@ bin_PROGRAMS = xorgconfig
X11dir = $(libdir)/X11 X11dir = $(libdir)/X11
dist_X11_DATA = Cards dist_X11_DATA = Cards
xorgconfig_CFLAGS = $(DEP_CFLAGS) \ xorgconfig_CFLAGS = @XORGCONFIG_DEP_CFLAGS@ \
-DCARD_DATABASE_FILE='"$(X11dir)/Cards"' \ -DCARD_DATABASE_FILE='"$(X11dir)/Cards"' \
-DPROJECTROOT='"$(prefix)"' \ -DPROJECTROOT='"$(prefix)"' \
-DFILEMANSUFFIX='"$(FILE_MAN_SUFFIX)"' \ -DFILEMANSUFFIX='"$(FILE_MAN_SUFFIX)"' \
-DXVERSIONSTRING='"$(PACKAGE_STRING)"' -DXVERSIONSTRING='"$(PACKAGE_STRING)"'
xorgconfig_LDADD = $(XORGCONFIG_DEP_LIBS) xorgconfig_LDADD = @XORGCONFIG_DEP_LIBS@
xorgconfig_SOURCES = \ xorgconfig_SOURCES = \
cards.c \ cards.c \

2
xorg-server.pc.in
View File

@ -8,5 +8,5 @@ sdkdir=@sdkdir@
Name: xorg-server Name: xorg-server
Description: Modular X.Org X Server Description: Modular X.Org X Server
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
Cflags: -I${sdkdir} @MODULE_DEFINES@
Libs: -L${libdir} Libs: -L${libdir}
Cflags: -I${sdkdir} -DIN_MODULE -DXFree86Module