automake: src/gbm

libgbm.so.1.0.0 (instead of libgbm.so.1.0) is installed now
along with libgbm.so.1 (no change).

7 files changed, 46 insertions, 146 deletions

diff --git a/src/gbm/.gitignore b/src/gbm/.gitignore
new file mode 100644
index 00000000000..5c20805c564
--- /dev/null
+++ b/src/gbm/.gitignore
@@ -0,0 +1,6 @@
+.deps/
+.libs/
+Makefile
+Makefile.in
+libgbm.la
+libgbm_dri.la
diff --git a/src/gbm/Makefile b/src/gbm/Makefile
deleted file mode 100644
index 4769a97b699..00000000000
--- a/src/gbm/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# src/gbm/Makefile
-
-TOP = ../..
-include $(TOP)/configs/current
-
-SUBDIRS = backends main
-
-
-default install clean:
-	@for dir in $(SUBDIRS) ; do \
-		if [ -d $$dir ] ; then \
-			(cd $$dir && $(MAKE) $@) || exit 1 ; \
-		fi \
-	done
diff --git a/src/gbm/Makefile.am b/src/gbm/Makefile.am
new file mode 100644
index 00000000000..f874f6411a3
--- /dev/null
+++ b/src/gbm/Makefile.am
@@ -0,0 +1,34 @@
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = main/gbm.pc
+
+AM_CFLAGS = \
+	-D_OS_UNIX=1 \
+	-DMODULEDIR='"$(libdir)/gbm"' \
+	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/src/gbm/main \
+	$(LIBUDEV_CFLAGS) \
+	$(DLOPEN_CFLAGS) \
+	$(DEFINES)
+
+lib_LTLIBRARIES = libgbm.la
+include_HEADERS = main/gbm.h
+
+libgbm_la_SOURCES = \
+	main/gbm.c \
+	main/backend.c \
+	main/common.c
+libgbm_la_LDFLAGS = -version-info 1:0
+
+if HAVE_DRI
+noinst_LTLIBRARIES = libgbm_dri.la
+libgbm_dri_la_SOURCES = \
+	backends/dri/gbm_dri.c \
+	backends/dri/driver_name.c
+
+libgbm_dri_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	-DDEFAULT_DRIVER_DIR='"$(DRI_DRIVER_SEARCH_DIR)"' \
+	$(LIBDRM_CFLAGS)
+
+libgbm_la_LIBADD = libgbm_dri.la
+endif
diff --git a/src/gbm/backends/Makefile b/src/gbm/backends/Makefile
deleted file mode 100644
index 97eaac496d2..00000000000
--- a/src/gbm/backends/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# src/gbm/backends/Makefile
-
-TOP = ../../..
-include $(TOP)/configs/current
-
-SUBDIRS = $(GBM_BACKEND_DIRS)
-
-
-default install clean:
-	@for dir in $(SUBDIRS) ; do \
-		if [ -d $$dir ] ; then \
-			(cd $$dir ; $(MAKE) $@) || exit 1 ; \
-		fi \
-	done
diff --git a/src/gbm/backends/dri/Makefile b/src/gbm/backends/dri/Makefile
deleted file mode 100644
index 78fb3291227..00000000000
--- a/src/gbm/backends/dri/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# src/gbm/backends/dri/Makefile
-
-TOP = ../../../..
-include $(TOP)/configs/current
-
-GBM_BACKEND = gbm_dri
-GBM_SOURCES = gbm_dri.c driver_name.c
-
-GBM_INCLUDES = \
-	-I$(TOP)/include \
-	-I$(TOP)/src/gbm/main \
-
-GBM_LIBS = $(LIBUDEV_LIBS) $(LIBDRM_LIB) -L$(TOP)/lib -lglapi 
-
-GBM_CFLAGS = \
-	-DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\" \
-	$(LIBUDEV_CFLAGS) \
-	$(LIBDRM_CFLAGS)
-
-GBM_BUILTIN=true
-
-include ../Makefile.template
diff --git a/src/gbm/main/Makefile b/src/gbm/main/Makefile
deleted file mode 100644
index 5130b9b5df2..00000000000
--- a/src/gbm/main/Makefile
+++ /dev/null
@@ -1,90 +0,0 @@
-# src/gbm/main/Makefile
-
-TOP = ../../..
-include $(TOP)/configs/current
-
-INCLUDE_DIRS = -I$(TOP)/include
-
-HEADERS =		\
-	common.h	\
-	backend.h	\
-	gbmint.h	\
-	gbm.h	
-
-SOURCES =		\
-	gbm.c		\
-	backend.c	\
-	common.c
-
-OBJECTS = $(SOURCES:.c=.o)
-
-# use dl*() to load drivers
-LOCAL_CFLAGS = $(LIBUDEV_CFLAGS) $(DLOPEN_CFLAGS) \
-	       -D_OS_UNIX=1 -DMODULEDIR='"$(GBM_BACKEND_INSTALL_DIR)"'
-LOCAL_LIBS =
-
-# Builtin backends
-ifeq ($(filter dri, $(GBM_BACKEND_DIRS)),dri)
-LOCAL_LIBS += $(TOP)/src/gbm/backends/dri/libgbm_dri.a
-endif
-
-.c.o:
-	$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $(LOCAL_CFLAGS) $< -o $@
-
-
-default: depend library
-
-
-library: $(TOP)/$(LIB_DIR)/libgbm.so
-
-$(TOP)/$(LIB_DIR)/libgbm.so: $(OBJECTS) $(LOCAL_LIBS)
-	$(MKLIB) -o gbm -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-		-major 1 -minor 0 \
-		-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
-		-L$(TOP)/$(LIB_DIR) $(GBM_LIB_DEPS) \
-		$(OBJECTS) $(LOCAL_LIBS)
-
-install-headers:
-	$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/
-	$(INSTALL) -m 644 $(TOP)/src/gbm/main/gbm.h \
-		$(DESTDIR)$(INSTALL_INC_DIR)
-
-
-PKG_CONFIG_DIR = $(INSTALL_LIB_DIR)/pkgconfig
-
-gbm_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@,0.0.0,' \
-	-e 's,@GBM_PC_REQ_PRIV@,$(GBM_PC_REQ_PRIV),' \
-	-e 's,@GBM_PC_LIB_PRIV@,$(GBM_PC_LIB_PRIV),' \
-	-e 's,@GBM_PC_CFLAGS@,$(GBM_PC_CFLAGS),' \
-	-e 's,@GBM_LIB@,$(GBM_LIB),'
-
-gbm.pc: gbm.pc.in
-	$(gbm_pcedit) $< > $@
-
-install: default install-headers gbm.pc
-	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
-	$(MINSTALL) $(TOP)/$(LIB_DIR)/libgbm.so* \
-		$(DESTDIR)$(INSTALL_LIB_DIR)
-	$(INSTALL) -d $(DESTDIR)$(PKG_CONFIG_DIR)
-	$(INSTALL) -m 644 gbm.pc $(DESTDIR)$(PKG_CONFIG_DIR)
-
-clean:
-	-rm -f *.o
-	-rm -f depend depend.bak
-	-rm -f gbm.pc
-
-
-depend: $(SOURCES) $(HEADERS)
-	@ echo "running $(MKDEP)"
-	@ rm -f depend
-	@ touch depend
-	$(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) \
-		$(SOURCES) $(HEADERS) > /dev/null 2>/dev/null
-
-
--include depend
-# DO NOT DELETE
diff --git a/src/gbm/main/gbm.pc.in b/src/gbm/main/gbm.pc.in
index 76299e77f83..4f1c53c0ecd 100644
--- a/src/gbm/main/gbm.pc.in
+++ b/src/gbm/main/gbm.pc.in
@@ -1,12 +1,12 @@
-prefix=@INSTALL_DIR@
-exec_prefix=${prefix}
-libdir=@INSTALL_LIB_DIR@
-includedir=@INSTALL_INC_DIR@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
 
 Name: gbm
 Description: Mesa gbm library
 Requires.private: @GBM_PC_REQ_PRIV@
 Version: @VERSION@
-Libs: -L${libdir} -l@GBM_LIB@
+Libs: -L${libdir} -lgbm
 Libs.private: @GBM_PC_LIB_PRIV@
-Cflags: -I${includedir} @GBM_PC_CFLAGS@
+Cflags: -I${includedir}