diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | GL/glx/Makefile.am | 2 | ||||
| -rw-r--r-- | Xprint/Makefile.am | 2 | ||||
| -rw-r--r-- | Xprint/pcl/Makefile.am | 2 | ||||
| -rw-r--r-- | Xprint/ps/Makefile.am | 2 | ||||
| -rw-r--r-- | Xprint/raster/Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 15 | ||||
| -rw-r--r-- | hw/xfree86/utils/xorgconfig/Makefile.am | 4 | ||||
| -rw-r--r-- | xorg-server.pc.in | 2 |
9 files changed, 32 insertions, 11 deletions
@@ -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> * hw/xfree86/os-support/linux/Makefile.am: diff --git a/GL/glx/Makefile.am b/GL/glx/Makefile.am index 6d430a325..8769b602c 100644 --- a/GL/glx/Makefile.am +++ b/GL/glx/Makefile.am @@ -1,6 +1,6 @@ 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 #sdk_HEADERS = diff --git a/Xprint/Makefile.am b/Xprint/Makefile.am index 26a2afd41..de8874493 100644 --- a/Xprint/Makefile.am +++ b/Xprint/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = doc pcl raster ps etc 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_LDADD = @XPRINT_LIBS@ pcl/libpcl.la raster/libraster.la diff --git a/Xprint/pcl/Makefile.am b/Xprint/pcl/Makefile.am index e8bbae09e..e98434167 100644 --- a/Xprint/pcl/Makefile.am +++ b/Xprint/pcl/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libpcl.la 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 = \ PclArc.c \ diff --git a/Xprint/ps/Makefile.am b/Xprint/ps/Makefile.am index a98dc3561..617e2aa64 100644 --- a/Xprint/ps/Makefile.am +++ b/Xprint/ps/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libps.la 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 = \ PsArc.c \ diff --git a/Xprint/raster/Makefile.am b/Xprint/raster/Makefile.am index 168bcfe41..2afd29c32 100644 --- a/Xprint/raster/Makefile.am +++ b/Xprint/raster/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libraster.la 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 = \ RasterAttVal.c \ diff --git a/configure.ac b/configure.ac index 09a9fcbd9..04a9af8bd 100644 --- a/configure.ac +++ b/configure.ac @@ -511,6 +511,8 @@ if test "x$RES" = xyes; then fi 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]) GLX_LIBS='$(top_builddir)/GL/glx/libglx.la $(top_builddir)/GL/mesa/libGLcore.la' test -d GL || mkdir GL @@ -1000,6 +1002,11 @@ if test "x$XORG" = xyes; then AC_SUBST([XORG_CFLAGS]) 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 XF86CONFIGFILE="xorg.conf" CONFIGFILE="$sysconfdir/$XF86CONFIGFILE" @@ -1055,8 +1062,8 @@ AC_MSG_RESULT([$XPRINT]) if test "x$XPRINT" = xyes; then 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_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 $GLX_INC" + XPRINT_LIBS="$XPRINT_LIBS $DIX_LIB $XKB_LIB $XKB_STUB_LIB $OS_LIB $XPRINT_EXTENSIONS $MI_LIB $MIEXT_DAMAGE_LIB" + AC_SUBST([XPRINT_CFLAGS]) AC_SUBST([XPRINT_LIBS]) xpconfigdir=$libdir/X11/xserver @@ -1177,7 +1184,9 @@ esac AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix]) 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 AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg], diff --git a/hw/xfree86/utils/xorgconfig/Makefile.am b/hw/xfree86/utils/xorgconfig/Makefile.am index 9f8ca8f70..848a4f4cd 100644 --- a/hw/xfree86/utils/xorgconfig/Makefile.am +++ b/hw/xfree86/utils/xorgconfig/Makefile.am @@ -31,13 +31,13 @@ bin_PROGRAMS = xorgconfig X11dir = $(libdir)/X11 dist_X11_DATA = Cards -xorgconfig_CFLAGS = $(DEP_CFLAGS) \ +xorgconfig_CFLAGS = @XORGCONFIG_DEP_CFLAGS@ \ -DCARD_DATABASE_FILE='"$(X11dir)/Cards"' \ -DPROJECTROOT='"$(prefix)"' \ -DFILEMANSUFFIX='"$(FILE_MAN_SUFFIX)"' \ -DXVERSIONSTRING='"$(PACKAGE_STRING)"' -xorgconfig_LDADD = $(XORGCONFIG_DEP_LIBS) +xorgconfig_LDADD = @XORGCONFIG_DEP_LIBS@ xorgconfig_SOURCES = \ cards.c \ diff --git a/xorg-server.pc.in b/xorg-server.pc.in index 60fb04cb9..33fb86c1f 100644 --- a/xorg-server.pc.in +++ b/xorg-server.pc.in @@ -8,5 +8,5 @@ sdkdir=@sdkdir@ Name: xorg-server Description: Modular X.Org X Server Version: @PACKAGE_VERSION@ +Cflags: -I${sdkdir} @MODULE_DEFINES@ Libs: -L${libdir} -Cflags: -I${sdkdir} -DIN_MODULE -DXFree86Module |