i965: Skip _mesa_load_state_parameters when there are zero parameters.

[mesa.git] / src / mesa / drivers / dri / r200 / Makefile.am

diff --git a/src/mesa/drivers/dri/r200/Makefile.am b/src/mesa/drivers/dri/r200/Makefile.am
index 1819f1763c3fb427c22e18d29d209e9f61b1d756..3a31fcb30daaca7e1b5ff7f2bdbbfca15c9c0673 100644 (file)
--- a/src/mesa/drivers/dri/r200/Makefile.am
+++ b/src/mesa/drivers/dri/r200/Makefile.am
@@ -23,9 +23,6 @@
 
 include Makefile.sources
 
-# Hack to make some of the non-automake variables work.
-TOP=$(top_builddir)
-
 AM_CFLAGS = \
        -DRADEON_R200 \
        -I$(top_srcdir)/include \
@@ -34,28 +31,11 @@ AM_CFLAGS = \
        -I$(top_srcdir)/src/mesa/ \
        -I$(top_srcdir)/src/mesa/drivers/dri/common \
        -I$(top_srcdir)/src/mesa/drivers/dri/r200/server \
+       -I$(top_builddir)/src/mesa/drivers/dri/common \
        $(DEFINES) \
-       $(API_DEFINES) \
        $(VISIBILITY_CFLAGS) \
        $(RADEON_CFLAGS)
 
-dridir = $(DRI_DRIVER_INSTALL_DIR)
-
-if HAVE_R200_DRI
-dri_LTLIBRARIES = r200_dri.la
-endif
-
-r200_dri_la_SOURCES = \
-        $(R200_C_FILES)
-
-r200_dri_la_LDFLAGS = -module -avoid-version -shared
-r200_dri_la_LIBADD = \
-       $(DRI_LIB_DEPS) \
-       $(RADEON_LIBS) \
-       ../common/libdricommon.la
-
-# Provide compatibility with scripts for the old Mesa build system for
-# a while by putting a link to the driver into /lib of the build tree.
-all-local: r200_dri.la
-       $(MKDIR_P) $(top_builddir)/$(LIB_DIR);
-       ln -f .libs/r200_dri.so $(top_builddir)/$(LIB_DIR)/r200_dri.so;
+noinst_LTLIBRARIES = libr200_dri.la
+libr200_dri_la_SOURCES = $(R200_C_FILES)
+libr200_dri_la_LIBADD = $(RADEON_LIBS)