From 361f4259cc8434f1ade6d43b66d29ca7e72fac08 Mon Sep 17 00:00:00 2001 From: David Reveman Date: Fri, 10 Feb 2006 16:06:38 +0000 Subject: [PATCH] Fix and cleanup xgl makefiles --- ChangeLog | 10 +++++++ configure.ac | 26 +++++++++--------- hw/xgl/Makefile.am | 45 ++++++++++++++++++-------------- hw/xgl/egl/Makefile.am | 32 +++++++++++------------ hw/xgl/egl/module/Makefile.am | 8 +++--- hw/xgl/glx/Makefile.am | 22 ++++++++-------- hw/xgl/glx/module/Makefile.am | 20 +++++++------- hw/xgl/glxext/Makefile.am | 18 ++++++------- hw/xgl/glxext/module/Makefile.am | 8 +++--- 9 files changed, 104 insertions(+), 85 deletions(-) diff --git a/ChangeLog b/ChangeLog index a7a49bf66..63e9050b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2006-02-10 David Reveman + * configure.ac: + * hw/xgl/Makefile.am: + * hw/xgl/egl/Makefile.am: + * hw/xgl/egl/module/Makefile.am: + * hw/xgl/glx/Makefile.am: + * hw/xgl/glx/module/Makefile.am: + * hw/xgl/glxext/Makefile.am: + * hw/xgl/glxext/module/Makefile.am: Fix and cleanup (_DEPENDENCIES and + _LIBS should now be correct). + * composite/compwindow.c: * composite/compint.h: * composite/compinit.c: diff --git a/configure.ac b/configure.ac index 0b122b0c9..01eaf561d 100644 --- a/configure.ac +++ b/configure.ac @@ -908,17 +908,19 @@ AC_MSG_RESULT([$XORG]) dnl Xgl DDX +XGL_REQUIRED_GLITZ_VERSION=0.5.2 + AC_MSG_CHECKING([whether to build Xgl DDX]) if test "x$XGL" != xno; then - PKG_CHECK_MODULES([XGLMODULES], [glitz-glx >= 0.4.3], [XGL=yes], [XGL=no]) - AC_SUBST(XGLMODULES_CFLAGS) - AC_SUBST(XGLMODULES_LIBS) + PKG_CHECK_MODULES([XGLMODULES], [glitz >= $XGL_REQUIRED_GLITZ_VERSION], [XGL=yes], [XGL=no]) + AC_SUBST(XGLMODULES_CFLAGS) + AC_SUBST(XGLMODULES_LIBS) fi AC_MSG_RESULT([$XGL]) AM_CONDITIONAL(XGL, [test "x$XGL" = xyes]) if test "x$XGL" = xyes; then - XGL_LIBS="$FB_LIB $MI_LIB $COMPOSITE_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB" + XGL_LIBS="$FB_LIB $MI_LIB $COMPOSITE_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB" AC_SUBST([XGL_LIBS]) AC_DEFINE(XGL_MODULAR, 1, [Use loadable XGL modules]) SERVER_DEFINES="$SERVER_DEFINES -DXGLServer" @@ -932,15 +934,15 @@ dnl Xegl DDX AC_MSG_CHECKING([whether to build Xegl DDX]) if test "x$XEGL" != xno; then - PKG_CHECK_MODULES([XGLMODULES], [glitz-glx >= 0.4.3], [XEGL=yes], [XEGL=no]) - AC_SUBST(XEGLMODULES_CFLAGS) - AC_SUBST(XEGLMODULES_LIBS) + PKG_CHECK_MODULES([XGLMODULES], [glitz-egl >= $XGL_REQUIRED_GLITZ_VERSION], [XEGL=yes], [XEGL=no]) + AC_SUBST(XEGLMODULES_CFLAGS) + AC_SUBST(XEGLMODULES_LIBS) fi AC_MSG_RESULT([$XEGL]) AM_CONDITIONAL(XEGL, [test "x$XEGL" = xyes]) if test "x$XEGL" = xyes; then - XEGL_LIBS="$FB_LIB $MI_LIB $COMPOSITE_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB" + XEGL_LIBS="$FB_LIB $MI_LIB $COMPOSITE_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB" AC_SUBST([XEGL_LIBS]) fi @@ -948,15 +950,15 @@ dnl Xglx DDX AC_MSG_CHECKING([whether to build Xglx DDX]) if test "x$XGLX" != xno; then - PKG_CHECK_MODULES([XGLXMODULES], [glitz-glx >= 0.4.3 xrender], [XGLX=yes], [XGLX=no]) - AC_SUBST(XGLXMODULES_CFLAGS) - AC_SUBST(XGLXMODULES_LIBS) + PKG_CHECK_MODULES([XGLXMODULES], [glitz-glx >= $XGL_REQUIRED_GLITZ_VERSION xrender >= 0.5 xrandr >= 0.5], [XGLX=yes], [XGLX=no]) + AC_SUBST(XGLXMODULES_CFLAGS) + AC_SUBST(XGLXMODULES_LIBS) fi AC_MSG_RESULT([$XGLX]) AM_CONDITIONAL(XGLX, [test "x$XGLX" = xyes]) if test "x$XGLX" = xyes; then - XGLX_LIBS="$FB_LIB $MI_LIB $COMPOSITE_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB" + XGLX_LIBS="$FB_LIB $MI_LIB $COMPOSITE_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB" AC_SUBST([XGLX_LIBS]) fi diff --git a/hw/xgl/Makefile.am b/hw/xgl/Makefile.am index 0aa94f9a5..d3b6e77b6 100644 --- a/hw/xgl/Makefile.am +++ b/hw/xgl/Makefile.am @@ -18,13 +18,13 @@ SUBDIRS = \ $(XGLX_SUBDIRS) \ $(XEGL_SUBDIRS) -AM_CFLAGS = \ - @SERVER_DEFINES@ \ - -DHAVE_XGL_CONFIG_H \ - -DHAVE_DIX_CONFIG_H \ - -I$(top_srcdir)/GL/glx \ - -I$(top_srcdir)/GL/include \ - -I@MESA_SOURCE@/include \ +AM_CFLAGS = \ + @SERVER_DEFINES@ \ + -DHAVE_XGL_CONFIG_H \ + -DHAVE_DIX_CONFIG_H \ + -I$(top_srcdir)/GL/glx \ + -I$(top_srcdir)/GL/include \ + -I@MESA_SOURCE@/include \ -I@MESA_SOURCE@/src/mesa/glapi \ $(XGLMODULES_CFLAGS) @@ -56,7 +56,7 @@ libxgl_a_SOURCES = \ xglpict.c \ xglglyph.c \ xgltrap.c \ - xglloader.c \ + xglloader.c \ xglhash.c \ xglglx.c \ xglxv.c @@ -64,19 +64,24 @@ libxgl_a_SOURCES = \ EXTRA_DIST = \ xglmodule.h -Xgl_LDFLAGS = -export-dynamic -Xgl_SOURCES = \ - xglinit.c \ - $(top_srcdir)/mi/miinitext.c \ - $(top_srcdir)/Xext/dpmsstubs.c \ - $(top_srcdir)/Xi/stubs.c \ - $(top_srcdir)/fb/fbcmap.c -Xgl_LDADD = \ - libxgl.a \ +Xgl_DEPENDENCIES = \ $(XORG_CORE_LIBS) \ - $(XGL_LIBS) \ - $(XSERVER_LIBS) \ - $(EXTENSION_LIBS) -lglitz -ldl + $(XGL_LIBS) +Xgl_LDFLAGS = -export-dynamic +Xgl_SOURCES = \ + xglinit.c \ + $(top_srcdir)/mi/miinitext.c \ + $(top_srcdir)/Xext/dpmsstubs.c \ + $(top_srcdir)/Xi/stubs.c \ + $(top_srcdir)/fb/fbcmap.c +Xgl_LDADD = \ + libxgl.a \ + $(XORG_CORE_LIBS) \ + $(XSERVER_LIBS) \ + $(XGL_LIBS) \ + $(XGLMODULES_LIBS) \ + -ldl + Xgl_programs = Xgl bin_PROGRAMS = $(Xgl_programs) diff --git a/hw/xgl/egl/Makefile.am b/hw/xgl/egl/Makefile.am index 701320de5..a9370b3e4 100644 --- a/hw/xgl/egl/Makefile.am +++ b/hw/xgl/egl/Makefile.am @@ -4,12 +4,12 @@ endif DIST_SUBDIRS = module -SUBDIRS = \ - . \ +SUBDIRS = \ + . \ $(XGL_MODULE_DIRS) -AM_CFLAGS = \ - @SERVER_DEFINES@ \ +AM_CFLAGS = \ + @SERVER_DEFINES@ \ -DHAVE_XGL_CONFIG_H \ -DHAVE_DIX_CONFIG_H \ $(XEGLMODULES_CFLAGS) @@ -26,20 +26,20 @@ libxegl_la_SOURCES = \ Xegl_DEPENDENCIES = @XEGL_LIBS@ Xegl_LDFLAGS = -export-dynamic -Xegl_SOURCES = \ - xeglinit.c \ - $(top_srcdir)/mi/miinitext.c \ +Xegl_SOURCES = \ + xeglinit.c \ + $(top_srcdir)/mi/miinitext.c \ $(top_srcdir)/Xext/dpmsstubs.c \ - $(top_srcdir)/Xi/stubs.c \ + $(top_srcdir)/Xi/stubs.c \ $(top_srcdir)/fb/fbcmap.c -Xegl_LDADD = \ - libxegl.la \ - ../libxgl.a \ - $(XORG_CORE_LIBS) \ - $(XEGL_LIBS) \ - $(XSERVER_LIBS) \ - $(EXTENSION_LIBS) \ +Xegl_LDADD = \ + libxegl.la \ + $(top_builddir)/hw/xgl/libxgl.a \ + $(XORG_CORE_LIBS) \ + $(XEGL_LIBS) \ + $(XSERVER_LIBS) \ + $(EXTENSION_LIBS) \ $(XGLXMODULES_LIBS) -Xegl_programs = Xegl +Xegl_programs = Xegl bin_PROGRAMS = $(Xegl_programs) diff --git a/hw/xgl/egl/module/Makefile.am b/hw/xgl/egl/module/Makefile.am index 7ed217322..813bfe7ec 100644 --- a/hw/xgl/egl/module/Makefile.am +++ b/hw/xgl/egl/module/Makefile.am @@ -1,11 +1,11 @@ -AM_CFLAGS = \ - -I$(srcdir)/.. \ - -I$(srcdir)/../.. \ +AM_CFLAGS = \ + -I$(top_srcdir)/hw/xgl/egl \ + -I$(top_srcdir)/hw/xgl \ $(XEGLMODULES_CFLAGS) libxegl_la_LDFLAGS = -avoid-version libxegl_la_SOURCES = xeglmodule.c -libxegl_la_LIBADD = \ +libxegl_la_LIBADD = \ $(top_builddir)/hw/xgl/glx/libxegl.la \ $(XEGLMODULES_LIBS) diff --git a/hw/xgl/glx/Makefile.am b/hw/xgl/glx/Makefile.am index 4bc0189a4..8cf3254ae 100644 --- a/hw/xgl/glx/Makefile.am +++ b/hw/xgl/glx/Makefile.am @@ -4,20 +4,20 @@ endif DIST_SUBDIRS = module -SUBDIRS = \ - . \ +SUBDIRS = \ + . \ $(XGL_MODULE_DIRS) -AM_CFLAGS = \ - -I$(srcdir)/.. \ - -I$(srcdir)/../glxext \ - -I$(top_srcdir)/GL/glx \ - -I$(top_srcdir)/GL/include \ - -I@MESA_SOURCE@/include \ +AM_CFLAGS = \ + -I$(top_srcdir)/hw/xgl \ + -I$(top_srcdir)/hw/xgl/glxext \ + -I$(top_srcdir)/GL/glx \ + -I$(top_srcdir)/GL/include \ + -I@MESA_SOURCE@/include \ -I@MESA_SOURCE@/src/mesa/glapi \ - @SERVER_DEFINES@ \ - -DHAVE_XGL_CONFIG_H \ - -DHAVE_DIX_CONFIG_H \ + @SERVER_DEFINES@ \ + -DHAVE_XGL_CONFIG_H \ + -DHAVE_DIX_CONFIG_H \ $(XGLXMODULES_CFLAGS) noinst_LTLIBRARIES = libxglx.la diff --git a/hw/xgl/glx/module/Makefile.am b/hw/xgl/glx/module/Makefile.am index 846942a43..8764173c3 100644 --- a/hw/xgl/glx/module/Makefile.am +++ b/hw/xgl/glx/module/Makefile.am @@ -2,19 +2,21 @@ if GLX GLX_LIB = $(top_builddir)/hw/xgl/glxext/libxglglxext.la endif -AM_CFLAGS = \ - -I$(srcdir)/.. \ - -I$(srcdir)/../.. \ +LIBXGLX_LIBS = \ + $(top_builddir)/hw/xgl/glx/libxglx.la \ + $(GLX_LIB) + +AM_CFLAGS = \ + -I$(top_srcdir)/hw/xgl/glx \ + -I$(top_srcdir)/hw/xgl \ $(XGLXMODULES_CFLAGS) -libxglx_la_DEPENDENCIES = $(GLX_LIB) +libxglx_la_DEPENDENCIES = $(LIBXGLX_LIBS) libxglx_la_LDFLAGS = -avoid-version libxglx_la_SOURCES = xglxmodule.c -libxglx_la_LIBADD = \ - $(top_builddir)/hw/xgl/glx/libxglx.la \ - $(GLX_LIB) \ - $(XGLXMODULES_LIBS) \ - -lXrandr +libxglx_la_LIBADD = \ + $(LIBXGLX_LIBS) \ + $(XGLXMODULES_LIBS) moduledir = @xglmoduledir@ diff --git a/hw/xgl/glxext/Makefile.am b/hw/xgl/glxext/Makefile.am index f9b9c0d68..3b3c1c8a2 100644 --- a/hw/xgl/glxext/Makefile.am +++ b/hw/xgl/glxext/Makefile.am @@ -1,20 +1,20 @@ SUBDIRS = module -AM_CFLAGS = \ - @SERVER_DEFINES@ \ - -DHAVE_XGL_CONFIG_H \ - -DHAVE_DIX_CONFIG_H \ - $(XGLMODULES_CFLAGS) \ - -I$(top_srcdir)/GL/glx \ +AM_CFLAGS = \ + @SERVER_DEFINES@ \ + -DHAVE_XGL_CONFIG_H \ + -DHAVE_DIX_CONFIG_H \ + $(XGLMODULES_CFLAGS) \ + -I$(top_srcdir)/GL/glx \ -I$(top_srcdir)/GL/include \ - -I$(top_srcdir)/hw/xgl \ - -I@MESA_SOURCE@/include \ + -I$(top_srcdir)/hw/xgl \ + -I@MESA_SOURCE@/include \ -I@MESA_SOURCE@/src/mesa/glapi libxglglxext_libraries = libxglglxext.la libxglglxext_la_SOURCES = \ xglglxext.h \ - xglglxext.c \ + xglglxext.c \ xglglxlog.c noinst_LTLIBRARIES = $(libxglglxext_libraries) diff --git a/hw/xgl/glxext/module/Makefile.am b/hw/xgl/glxext/module/Makefile.am index 660838dd9..d459e3d08 100644 --- a/hw/xgl/glxext/module/Makefile.am +++ b/hw/xgl/glxext/module/Makefile.am @@ -1,7 +1,7 @@ -AM_CFLAGS = \ - @SERVER_DEFINES@ \ - -DHAVE_XGL_CONFIG_H \ - -DHAVE_DIX_CONFIG_H \ +AM_CFLAGS = \ + @SERVER_DEFINES@ \ + -DHAVE_XGL_CONFIG_H \ + -DHAVE_DIX_CONFIG_H \ $(XGLMODULES_CFLAGS) \ -I$(top_srcdir)/hw/xgl