[PATCH xserver 3/3] XQuartz: remove undefined XSERSER_CFLAGS variable

[Jeremy Huddleston]

Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>

On Feb 23, 2010, at 06:13, Gaetan Nadon wrote:

> This is a variable local to configure.ac which is not AC_SUBST()
> It is undefined in any generated Makefile.
> 
> Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
> ---
> hw/xquartz/GL/Makefile.am           |    6 +++++-
> hw/xquartz/Makefile.am              |    4 ++--
> hw/xquartz/mach-startup/Makefile.am |    4 +++-
> hw/xquartz/xpr/Makefile.am          |    5 ++++-
> 4 files changed, 14 insertions(+), 5 deletions(-)
> 
> diff --git a/hw/xquartz/GL/Makefile.am b/hw/xquartz/GL/Makefile.am
> index 0ac9d5f..66f19ad 100644
> --- a/hw/xquartz/GL/Makefile.am
> +++ b/hw/xquartz/GL/Makefile.am
> @@ -1,5 +1,9 @@
> noinst_LTLIBRARIES = libCGLCore.la
> -AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS) $(ALIASING_CFLAGS)
> +
> +AM_CFLAGS = \
> +	$(DIX_CFLAGS) \
> +	$(ALIASING_CFLAGS)
> +
> AM_CPPFLAGS = \
> 	-I$(top_srcdir) \
> 	-I$(top_srcdir)/glx \
> diff --git a/hw/xquartz/Makefile.am b/hw/xquartz/Makefile.am
> index 0a0ff95..9efe489 100644
> --- a/hw/xquartz/Makefile.am
> +++ b/hw/xquartz/Makefile.am
> @@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = libXquartz.la
> -AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS) $(ALIASING_CFLAGS)
> -AM_OBJCFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS) $(ALIASING_CFLAGS)
> +AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS)
> +AM_OBJCFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS)
> AM_CPPFLAGS = \
> 	-DBUILD_DATE=\"$(BUILD_DATE)\" \
> 	-DXSERVER_VERSION=\"$(VERSION)\" \
> diff --git a/hw/xquartz/mach-startup/Makefile.am b/hw/xquartz/mach-startup/Makefile.am
> index 77d17eb..9e4173e 100644
> --- a/hw/xquartz/mach-startup/Makefile.am
> +++ b/hw/xquartz/mach-startup/Makefile.am
> @@ -3,7 +3,9 @@ AM_CPPFLAGS = \
> 	-DXSERVER_VERSION=\"$(VERSION)\" \
> 	-DX11BINDIR=\"$(bindir)\"
> 
> -AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS) $(ALIASING_CFLAGS)
> +AM_CFLAGS = \
> +	$(DIX_CFLAGS) \
> +	$(ALIASING_CFLAGS)
> 
> x11appdir = $(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/MacOS
> x11app_PROGRAMS = X11.bin
> diff --git a/hw/xquartz/xpr/Makefile.am b/hw/xquartz/xpr/Makefile.am
> index e9a092f..965da36 100644
> --- a/hw/xquartz/xpr/Makefile.am
> +++ b/hw/xquartz/xpr/Makefile.am
> @@ -1,6 +1,9 @@
> noinst_LTLIBRARIES = libXquartzXpr.la
> 
> -AM_CFLAGS =  $(XSERVER_CFLAGS) $(DIX_CFLAGS) $(ALIASING_CFLAGS)
> +AM_CFLAGS =  \
> +	$(DIX_CFLAGS) \
> +	$(ALIASING_CFLAGS)
> +
> AM_CPPFLAGS = \
> 	-I$(srcdir) -I$(srcdir)/.. \
> 	-I$(top_srcdir)/miext \
> -- 
> 1.6.0.4
> 
> _______________________________________________
> xorg-devel mailing list
> xorg-devel at lists.x.org
> http://lists.x.org/mailman/listinfo/xorg-devel