automake: src/mesa/drivers/dri

diff --git a/configure.ac b/configure.ac
index 756c30921942fb683817eae1a84333a6fc1fe452..0f45df5b0a92367fc0456ea0710ca446850c0391 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1932,6 +1932,8 @@ CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS"
 
 dnl Substitute the config
 AC_CONFIG_FILES([configs/autoconf
+               src/mesa/drivers/dri/dri.pc
+               src/mesa/drivers/dri/Makefile
                src/mesa/drivers/dri/i915/Makefile
                src/mesa/drivers/dri/i965/Makefile
                src/mesa/drivers/dri/nouveau/Makefile

diff --git a/src/mesa/drivers/dri/.gitignore b/src/mesa/drivers/dri/.gitignore
new file mode 100644 (file)
index 0000000..282522d
--- /dev/null
+++ b/src/mesa/drivers/dri/.gitignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

diff --git a/src/mesa/drivers/dri/Makefile b/src/mesa/drivers/dri/Makefile
deleted file mode 100644 (file)
index 264648c..0000000
--- a/src/mesa/drivers/dri/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-# src/mesa/drivers/dri/Makefile
-
-TOP = ../../../..
-
-include $(TOP)/configs/current
-
-
-
-default: $(TOP)/$(LIB_DIR) subdirs dri.pc
-
-
-$(TOP)/$(LIB_DIR):
-       -mkdir $(TOP)/$(LIB_DIR)
-
-
-subdirs:
-       @for dir in $(DRI_DIRS) ; do \
-               if [ -d $$dir ] ; then \
-                       (cd $$dir && $(MAKE)) || exit 1 ; \
-               fi \
-       done
-
-pcedit = sed \
-       -e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \
-       -e 's,@INSTALL_LIB_DIR@,$(INSTALL_LIB_DIR),' \
-       -e 's,@INSTALL_INC_DIR@,$(INSTALL_INC_DIR),' \
-       -e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' \
-       -e 's,@DRI_DRIVER_DIR@,$(DRI_DRIVER_INSTALL_DIR),' \
-       -e 's,@DRI_PC_REQ_PRIV@,$(DRI_PC_REQ_PRIV),'
-
-dri.pc: dri.pc.in
-       $(pcedit) $< > $@
-
-
-install: dri.pc
-       @for dir in $(DRI_DIRS) ; do \
-               if [ -d $$dir ] ; then \
-                       (cd $$dir && $(MAKE) install) || exit 1 ; \
-               fi \
-       done
-       $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
-       $(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_interface.h \
-         $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
-       $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
-       $(INSTALL) -m 0644 dri.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
-
-
-clean:
-       -@for dir in $(DRI_DIRS) ; do \
-               if [ -d $$dir ] ; then \
-                       (cd $$dir && $(MAKE) clean) ; \
-               fi \
-       done
-       -rm -f common/*.o
-       -rm -f *.pc

diff --git a/src/mesa/drivers/dri/Makefile.am b/src/mesa/drivers/dri/Makefile.am
new file mode 100644 (file)
index 0000000..973d774
--- /dev/null
+++ b/src/mesa/drivers/dri/Makefile.am
@@ -0,0 +1,28 @@
+SUBDIRS=
+
+if HAVE_I915_DRI
+SUBDIRS+=i915
+endif
+
+if HAVE_I965_DRI
+SUBDIRS+=i965
+endif
+
+if HAVE_NOUVEAU_DRI
+SUBDIRS+=nouveau
+endif
+
+if HAVE_R200_DRI
+SUBDIRS+=r200
+endif
+
+if HAVE_RADEON_DRI
+SUBDIRS+=radeon
+endif
+
+if HAVE_SWRAST_DRI
+SUBDIRS+=swrast
+endif
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = dri.pc

diff --git a/src/mesa/drivers/dri/Makefile.defines b/src/mesa/drivers/dri/Makefile.defines
deleted file mode 100644 (file)
index 6ff8df5..0000000
--- a/src/mesa/drivers/dri/Makefile.defines
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*-makefile-*-
-
-# Import mesa_dri_common_*
-include ../common/Makefile.sources
-
-COMMON_GALLIUM_SOURCES = \
-       $(addprefix ../common/, $(mesa_dri_common_gallium_SOURCES))
-
-COMMON_SOURCES = \
-       $(addprefix ../common/, $(mesa_dri_common_SOURCES))
-
-INCLUDES = $(SHARED_INCLUDES) $(EXPAT_INCLUDES)
-
-OBJECTS = $(C_SOURCES:.c=.o) \
-         $(CXX_SOURCES:.cpp=.o) \
-         $(ASM_SOURCES:.S=.o) 
-
-
-### Include directories
-SHARED_INCLUDES = \
-       -I. \
-       -Iserver \
-       $(addprefix -I$(TOP)/, $(mesa_dri_common_INCLUDES)) \
-       $(LIBDRM_CFLAGS)
-
-INCLUDES += $(API_DEFINES)
-CXXFLAGS += $(API_DEFINES)

diff --git a/src/mesa/drivers/dri/Makefile.targets b/src/mesa/drivers/dri/Makefile.targets
deleted file mode 100644 (file)
index 436b2a3..0000000
--- a/src/mesa/drivers/dri/Makefile.targets
+++ /dev/null
@@ -1,78 +0,0 @@
-# -*-makefile-*-
-
-##### RULES #####
-
-.c.o:
-       $(CC) -c $(INCLUDES) $(DRI_CFLAGS) $(DRIVER_DEFINES) $< -o $@
-
-.cpp.o:
-       $(CC) -c $(INCLUDES) $(DRI_CXXFLAGS) $(DRIVER_DEFINES) $< -o $@
-
-.S.o:
-       $(CC) -c $(INCLUDES) $(DRI_CFLAGS) $(DRIVER_DEFINES) $< -o $@
-
-
-#### TARGETS #####
-
-default: subdirs lib
-
-
-.PHONY: lib
-lib: symlinks subdirs depend
-       @$(MAKE) $(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME)
-
-$(LIBNAME): $(OBJECTS) $(EXTRA_MODULES) $(MESA_MODULES) Makefile \
-               $(TOP)/src/mesa/drivers/dri/Makefile.targets $(TOP)/src/mesa/drivers/dri/common/dri_test.o
-       $(MKLIB) -o $@.tmp -noprefix -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
-               $(OBJECTS) $(EXTRA_MODULES) $(DRI_LIB_DEPS)
-       $(CXX) $(CFLAGS) -o $@.test $(TOP)/src/mesa/drivers/dri/common/dri_test.o $@.tmp $(DRI_LIB_DEPS)
-       @rm -f $@.test
-       mv -f $@.tmp $@
-
-
-$(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
-       $(INSTALL) $(LIBNAME) $(TOP)/$(LIB_DIR) 
-
-
-# If the Makefile defined SUBDIRS, run make in each
-.PHONY: subdirs
-subdirs:
-       @if test -n "$(SUBDIRS)" ; then \
-               for dir in $(SUBDIRS) ; do \
-                       if [ -d $$dir ] ; then \
-                               (cd $$dir && $(MAKE)) || exit 1; \
-                       fi \
-               done \
-       fi
-
-
-.PHONY: symlinks
-symlinks:
-
-
-depend: $(C_SOURCES) $(CXX_SOURCES) $(ASM_SOURCES) $(SYMLINKS)
-       @ echo "running $(MKDEP)"
-       @ rm -f depend
-       @ touch depend
-       @ $(MKDEP) $(MKDEP_OPTIONS) $(DRIVER_DEFINES) $(INCLUDES) \
-               $(C_SOURCES) $(CXX_SOURCES) \
-               $(ASM_SOURCES) > /dev/null 2>/dev/null
-
-
-# Emacs tags
-tags:
-       etags `find . -name \*.[ch]` `find ../include`
-
-
-# Remove .o and backup files
-clean:
-       -rm -f *.o */*.o *~ *.so *~ server/*.o $(SYMLINKS)
-       -rm -f depend depend.bak
-
-
-install: $(LIBNAME)
-       $(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
-       $(MINSTALL) -m 755 $(LIBNAME) $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
-
-
--include depend

diff --git a/src/mesa/drivers/dri/dri.pc.in b/src/mesa/drivers/dri/dri.pc.in
index 695aa6cfd662cb69ffece1031f3d159e258024c3..de6e08a4aa31df2da561748b2de36b36c2191c33 100644 (file)
--- a/src/mesa/drivers/dri/dri.pc.in
+++ b/src/mesa/drivers/dri/dri.pc.in
@@ -1,8 +1,8 @@
-prefix=@INSTALL_DIR@
-exec_prefix=${prefix}
-libdir=@INSTALL_LIB_DIR@
-includedir=@INSTALL_INC_DIR@
-dridriverdir=@DRI_DRIVER_DIR@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+dridriverdir=@DRI_DRIVER_INSTALL_DIR@
 
 Name: dri
 Description: Direct Rendering Infrastructure