Mesa (master): gbm/Makefile.template: Remove builtin-compile path
Benjamin Franzke
bnf at kemper.freedesktop.org
Tue Jan 24 09:53:03 UTC 2012
Module: Mesa
Branch: master
Commit: ab52be68261bb6d2d27dab9fda40810022ba3475
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ab52be68261bb6d2d27dab9fda40810022ba3475
Author: Benjamin Franzke <benjaminfranzke at googlemail.com>
Date: Tue Jan 24 09:29:43 2012 +0100
gbm/Makefile.template: Remove builtin-compile path
Builtins are handled by the main gbm Makefile since
06ad64ad29e7aa9e2d001f6bd1f8c1c1f77050b8.
---
src/gbm/backends/Makefile.template | 10 ----------
1 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/src/gbm/backends/Makefile.template b/src/gbm/backends/Makefile.template
index f0f1823..eba1dd7 100644
--- a/src/gbm/backends/Makefile.template
+++ b/src/gbm/backends/Makefile.template
@@ -15,14 +15,8 @@
GBM_BACKEND_PATH = $(TOP)/$(LIB_DIR)/gbm/$(GBM_BACKEND).so
GBM_OBJECTS = $(GBM_SOURCES:.c=.o)
-# built-in or external
-ifeq ($(GBM_BUILTIN), true)
-GBM_TARGET = lib$(GBM_BACKEND).a
-GBM_INSTALL =
-else
GBM_TARGET = $(GBM_BACKEND_PATH)
GBM_INSTALL = install-so
-endif
default: depend $(GBM_TARGET) $(GBM_EXTRA_TARGETS)
@@ -36,9 +30,6 @@ $(GBM_BACKEND).so: $(GBM_OBJECTS) Makefile $(TOP)/src/gbm/backends/Makefile.temp
$(MKLIB_OPTIONS) \
$(GBM_OBJECTS) $(GBM_LIBS) -lgbm
-lib$(GBM_BACKEND).a: $(GBM_OBJECTS) Makefile $(TOP)/src/gbm/backends/Makefile.template
- @$(MKLIB) -o $(GBM_BACKEND) -static $(GBM_OBJECTS)
-
.c.o:
$(CC) -c $(GBM_INCLUDES) $(CFLAGS) $(GBM_CFLAGS) $< -o $@
@@ -50,7 +41,6 @@ install: $(GBM_INSTALL) $(GBM_EXTRA_INSTALL)
clean: $(GBM_EXTRA_CLEAN)
rm -f $(GBM_BACKEND).so
- rm -f lib$(GBM_BACKEND).a
rm -f $(GBM_OBJECTS)
rm -f depend depend.bak
More information about the mesa-commit
mailing list