[Glamor] [PATCH 7/8] Make: remove cruft copied over from the X server makefiles

[Gaetan Nadon]

In toplevel makefile:
nostdinc: only xserver, no other X modules
aclocaldir: no local macros to install
xkb_path: xserver only
"Gross hack": xserver only

In src/makefile:
SOLARIS_ASM_CFLAGS; server only
XORG_INCS: undefined variable
DIX_CFLAGS: undefined variable

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 Makefile.am     |   12 ------------
 src/Makefile.am |    9 +--------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e5bb407..ee5e85f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,18 +1,10 @@
-AUTOMAKE_OPTIONS=nostdinc
 ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = src conf
 
-aclocaldir = $(datadir)/aclocal
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = glamor-egl.pc glamor.pc
 
-DISTCHECK_CONFIGURE_FLAGS=\
-	--with-xkb-path=$(XKB_BASE_DIRECTORY) \
-	--with-xkb-bin-directory=$(XKB_BIN_DIRECTORY) \
-	--with-xkb-output='$${datadir}/X11/xkb/compiled'
-
 .PHONY: ChangeLog INSTALL
 
 INSTALL:
@@ -22,7 +14,3 @@ ChangeLog:
 	$(CHANGELOG_CMD)
 
 dist-hook: ChangeLog INSTALL
-
-# gross hack
-relink: all
-	$(AM_V_at)$(MAKE) -C hw relink
diff --git a/src/Makefile.am b/src/Makefile.am
index 50cfe97..79ea959 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,19 +1,12 @@
 lib_LTLIBRARIES = libglamor.la
 
-# Override these since glamor doesn't need them and the needed files aren't
-# built (in hw/xfree86/os-support/solaris) until after glamor is built
-SOLARIS_ASM_CFLAGS=""
-
 if GLAMOR_GLES2
 libglamor_la_LIBADD = $(GLESV2_LIBS)
 else
 libglamor_la_LIBADD = $(GL_LIBS)
 endif
 
-AM_CPPFLAGS = \
-	$(XORG_INCS)
-
-AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS) $(DIX_CFLAGS) $(LIBDRM_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS) $(LIBDRM_CFLAGS)
 
 libglamor_la_LDFLAGS = -version-info 0:0:0
 
-- 
1.7.9.5