Clean up CPPFLAGS handling in xserver

Make things a bit easier to maintain. This style is also more in line
with what is being done for other DDX.

diff --git a/unix/xserver/hw/vnc/Makefile.am b/unix/xserver/hw/vnc/Makefile.am
index f4b5d929a35182c3415f8bb1230284ceeadbb158..701f106780595aad8ab85fd0d3b511d30b6cbbac 100644 (file)
--- a/unix/xserver/hw/vnc/Makefile.am
+++ b/unix/xserver/hw/vnc/Makefile.am
@@ -8,6 +8,12 @@ NETWORK_LIB=$(TIGERVNC_BUILDDIR)/common/network/libnetwork.la
 UNIXCOMMON_LIB=$(TIGERVNC_BUILDDIR)/unix/common/libunixcommon.la
 COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(OS_LIB) $(UNIXCOMMON_LIB)
 
+AM_CPPFLAGS = \
+       -I$(TIGERVNC_BUILDDIR) \
+       -I$(TIGERVNC_SRCDIR)/common \
+       -I$(TIGERVNC_SRCDIR)/unix/common \
+       $(DIX_CFLAGS)
+
 noinst_LTLIBRARIES = libvnccommon.la
 
 HDRS = vncExtInit.h vncHooks.h \
@@ -20,12 +26,8 @@ libvnccommon_la_SOURCES = $(HDRS) \
        vncBlockHandler.c XorgGlue.c RandrGlue.c RFBGlue.cc XserverDesktop.cc \
        vncInput.c vncInputXKB.c qnum_to_xorgevdev.c qnum_to_xorgkbd.c
 
-libvnccommon_la_CPPFLAGS = \
-       -I$(TIGERVNC_BUILDDIR) \
-       -I$(TIGERVNC_SRCDIR)/unix/common \
-       -I$(TIGERVNC_SRCDIR)/common \
-       -I$(TIGERVNC_SRCDIR)/unix/vncconfig $(XVNC_CPPFLAGS) ${XSERVERLIBS_CFLAGS} \
-       -I$(top_srcdir)/include
+libvnccommon_la_CPPFLAGS = $(AM_CPPFLAGS) \
+       -I$(TIGERVNC_SRCDIR)/unix/vncconfig
 
 bin_PROGRAMS = Xvnc
 
@@ -40,11 +42,7 @@ Xvnc_SOURCES = xvnc.c \
 # recommendation for coaxing automake.
 nodist_EXTRA_Xvnc_SOURCES = dummy.cxx
 
-Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DTIGERVNC \
-       -I$(TIGERVNC_BUILDDIR) \
-       -I$(TIGERVNC_SRCDIR)/common \
-       -I$(TIGERVNC_SRCDIR)/unix/common \
-       -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS}
+Xvnc_CPPFLAGS = $(AM_CPPFLAGS) -DTIGERVNC
 
 LOCAL_LIBS = \
        $(XVNC_LIBS) \
@@ -65,15 +63,10 @@ libvnc_la_SOURCES = vncModule.c
 # See Xvnc magic above
 nodist_EXTRA_libvnc_la_SOURCES = dummy.cxx
 
-libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) \
-       -I$(TIGERVNC_BUILDDIR) \
-       -I$(TIGERVNC_SRCDIR)/common \
-       -I$(TIGERVNC_SRCDIR)/unix/common \
+libvnc_la_CPPFLAGS = $(AM_CPPFLAGS) \
        -I$(top_srcdir)/hw/xfree86/common \
        -I$(top_srcdir)/hw/xfree86/os-support \
-       -I$(top_srcdir)/hw/xfree86/os-support/bus \
-       -I$(top_srcdir)/include \
-       ${XSERVERLIBS_CFLAGS}
+       -I$(top_srcdir)/hw/xfree86/os-support/bus
 
 libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now
 

diff --git a/unix/xserver116.patch b/unix/xserver116.patch
index 79809f4e69b804ed23687525bf4a84f0d001adc5..82a286a18300b570382bed3a0c2306aacabb30ec 100644 (file)
--- a/unix/xserver116.patch
+++ b/unix/xserver116.patch
@@ -9,12 +9,11 @@ diff -up xorg-server-1.16.0/configure.ac.vnc xorg-server-1.16.0/configure.ac
  AC_PROG_LN_S
  LT_PREREQ([2.2])
  LT_INIT([disable-static win32-dll])
-@@ -1795,6 +1796,10 @@ if test "x$XVFB" = xyes; then
+@@ -1795,6 +1796,9 @@ if test "x$XVFB" = xyes; then
        AC_SUBST([XVFB_SYS_LIBS])
  fi
  
 +dnl Xvnc DDX
-+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"])
 +AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"])
 +AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"])
  

diff --git a/unix/xserver117.patch b/unix/xserver117.patch
index 59e96a55c626f42e7843281a184a2952360c6485..1b7fe35c058f1336a8395a6f69beea8e4975a2a0 100644 (file)
--- a/unix/xserver117.patch
+++ b/unix/xserver117.patch
@@ -9,12 +9,11 @@ diff -up xorg-server-1.17.1/configure.ac.vnc xorg-server-1.17.1/configure.ac
  AC_PROG_LN_S
  LT_PREREQ([2.2])
  LT_INIT([disable-static win32-dll])
-@@ -1795,6 +1796,10 @@ if test "x$XVFB" = xyes; then
+@@ -1795,6 +1796,9 @@ if test "x$XVFB" = xyes; then
        AC_SUBST([XVFB_SYS_LIBS])
  fi
  
 +dnl Xvnc DDX
-+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"])
 +AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"])
 +AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"])
  

diff --git a/unix/xserver118.patch b/unix/xserver118.patch
index c173d742c6e0e80c1480022f2c1ce2d1d5cb39b0..5eda1ec599cb25a0fb65f96708cf489d141cf938 100644 (file)
--- a/unix/xserver118.patch
+++ b/unix/xserver118.patch
@@ -9,12 +9,11 @@ diff -ur xorg-server.orig/configure.ac xorg-server/configure.ac
  AC_PROG_LN_S
  LT_PREREQ([2.2])
  LT_INIT([disable-static win32-dll])
-@@ -1828,6 +1829,10 @@
+@@ -1828,6 +1829,9 @@
        AC_SUBST([XVFB_SYS_LIBS])
  fi
  
 +dnl Xvnc DDX
-+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"])
 +AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"])
 +AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"])
  

diff --git a/unix/xserver119.patch b/unix/xserver119.patch
index accd2c7df86c64f43dde2eee622d01ef2f16ff12..e445569f7262740dd8c5e3012b43ffc2e79b43e0 100644 (file)
--- a/unix/xserver119.patch
+++ b/unix/xserver119.patch
@@ -9,12 +9,11 @@ diff -up xserver/configure.ac.xserver116-rebased xserver/configure.ac
  AC_PROG_LN_S
  LT_PREREQ([2.2])
  LT_INIT([disable-static win32-dll])
-@@ -1863,6 +1864,10 @@ if test "x$XVFB" = xyes; then
+@@ -1863,6 +1864,9 @@ if test "x$XVFB" = xyes; then
        AC_SUBST([XVFB_SYS_LIBS])
  fi
  
 +dnl Xvnc DDX
-+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"])
 +AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"])
 +AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"])
  

diff --git a/unix/xserver120.patch b/unix/xserver120.patch
index b20b7ea31a55da22929a85bb58a58aef556e138c..18972868477d64f02304c18197be140d5a42377b 100644 (file)
--- a/unix/xserver120.patch
+++ b/unix/xserver120.patch
@@ -10,12 +10,11 @@ Index: xserver/configure.ac
  AC_PROG_LN_S
  LT_PREREQ([2.2])
  LT_INIT([disable-static win32-dll])
-@@ -1777,6 +1778,10 @@ if test "x$XVFB" = xyes; then
+@@ -1777,6 +1778,9 @@ if test "x$XVFB" = xyes; then
        AC_SUBST([XVFB_SYS_LIBS])
  fi
  
 +dnl Xvnc DDX
-+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"])
 +AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"])
 +AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"])
  

diff --git a/unix/xserver21.1.1.patch b/unix/xserver21.1.1.patch
index 56331d187798a6df8340ce51666a9f877c37b09d..a6d237ef1804377fb7a90078ae0120243be979e4 100644 (file)
--- a/unix/xserver21.1.1.patch
+++ b/unix/xserver21.1.1.patch
@@ -9,12 +9,11 @@ diff -urpN xorg-server-1.20.0/configure.ac xorg-server-1.20.0/configure.ac
  AC_PROG_LN_S
  LT_PREREQ([2.2])
  LT_INIT([disable-static win32-dll])
-@@ -1777,6 +1778,10 @@ if test "x$XVFB" = xyes; then
+@@ -1777,6 +1778,9 @@ if test "x$XVFB" = xyes; then
        AC_SUBST([XVFB_SYS_LIBS])
  fi
  
 +dnl Xvnc DDX
-+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"])
 +AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"])
 +AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"])