summaryrefslogtreecommitdiffstats
path: root/src/mesa/Makefile
diff options
context:
space:
mode:
authorMatt Turner <[email protected]>2012-01-26 22:37:06 -0500
committerMatt Turner <[email protected]>2012-01-30 21:09:18 -0500
commit275ac7e5c1fd6c1847a428192fe259e50690fced (patch)
tree133f533526e15904a3c10b3aa3dee4e11ec43909 /src/mesa/Makefile
parente3b520049675f78065eccbc25c001ea77861c129 (diff)
automake: src/mesa/drivers/osmesa
Diffstat (limited to 'src/mesa/Makefile')
-rw-r--r--src/mesa/Makefile17
1 files changed, 2 insertions, 15 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 0e15d61bd8d..80e9562bb8c 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -189,15 +189,6 @@ gl_pcedit = sed \
gl.pc: gl.pc.in
$(gl_pcedit) $< > $@
-osmesa_pcedit = sed \
- $(pcedit) \
- -e 's,@OSMESA_LIB@,$(OSMESA_LIB),' \
- -e 's,@OSMESA_PC_REQ@,$(OSMESA_PC_REQ),' \
- -e 's,@OSMESA_PC_LIB_PRIV@,$(OSMESA_PC_LIB_PRIV),'
-
-osmesa.pc: osmesa.pc.in
- $(osmesa_pcedit) $< > $@
-
install-headers:
$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL
$(INSTALL) -m 644 $(TOP)/include/GL/*.h \
@@ -210,12 +201,8 @@ install-libgl: default gl.pc install-headers
$(DESTDIR)$(INSTALL_LIB_DIR)
$(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
-install-osmesa: default osmesa.pc
- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
- $(MINSTALL) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_GLOB) \
- $(DESTDIR)$(INSTALL_LIB_DIR)
- $(INSTALL) -m 644 osmesa.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
+install-osmesa: default
+ cd drivers/osmesa && $(MAKE) install
install-dri: default
cd drivers/dri && $(MAKE) install