diff options
| author | Matt Turner <[email protected]> | 2012-01-31 21:34:42 -0500 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2012-01-31 21:34:42 -0500 |
| commit | 7ef94c6a0b7d2f7a8c6d03b12262b0b9e57e414c (patch) | |
| tree | 7260dcd79320bac1ef11330010023ad50b8b86b5 /src/mesa/Makefile | |
| parent | a99164956f1ade01909123ba196ef01282f41675 (diff) | |
Revert "automake: src/mesa/drivers/osmesa"
This reverts commit 275ac7e5c1fd6c1847a428192fe259e50690fced.
Diffstat (limited to 'src/mesa/Makefile')
| -rw-r--r-- | src/mesa/Makefile | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile index 80e9562bb8c..0e15d61bd8d 100644 --- a/src/mesa/Makefile +++ b/src/mesa/Makefile @@ -189,6 +189,15 @@ 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 \ @@ -201,8 +210,12 @@ install-libgl: default gl.pc install-headers $(DESTDIR)$(INSTALL_LIB_DIR) $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig -install-osmesa: default - cd drivers/osmesa && $(MAKE) install +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-dri: default cd drivers/dri && $(MAKE) install |