diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2013-12-10 11:13:31 -0500 |
|---|---|---|
| committer | Zhigang Gong <zhigang.gong@gmail.com> | 2013-12-16 22:51:41 +0800 |
| commit | 083c1bbbe2cae697e4448e2065a337bf78897cbc (patch) | |
| tree | e3be85ec24aff7e0905a44344779f63341f87e82 | |
| parent | 2aa9f50ad12bb996e58ca14270a92fb4795a2868 (diff) | |
Make: remove cruft copied over from the X server makefiles
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@videotron.ca>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rw-r--r-- | src/Makefile.am | 9 |
2 files changed, 1 insertions, 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 |