diff options
| author | Kristian Høgsberg <[email protected]> | 2008-03-08 17:19:39 -0500 |
|---|---|---|
| committer | Kristian Høgsberg <[email protected]> | 2008-03-08 17:19:39 -0500 |
| commit | 47d563006de646b039c456ffc8379ca8ded3d5a5 (patch) | |
| tree | be5416b6612f79d0f3a6eaa3c7e0b6b5726cbbf8 | |
| parent | 6fd82f6fbd208dc7b1839ea408a5fb28589ee622 (diff) | |
Move libGL install target to the libGL Makefile.
| -rw-r--r-- | src/glx/x11/Makefile | 17 | ||||
| -rw-r--r-- | src/glx/x11/gl.pc.in (renamed from src/mesa/gl.pc.in) | 0 | ||||
| -rw-r--r-- | src/mesa/Makefile | 16 |
3 files changed, 16 insertions, 17 deletions
diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile index 3366f005eb5..1cef21cdae4 100644 --- a/src/glx/x11/Makefile +++ b/src/glx/x11/Makefile @@ -80,8 +80,21 @@ depend: $(SOURCES) $(MESA_GLAPI_SOURCES) $(MESA_ASM_API) Makefile tags: etags `find . -name \*.[ch]` `find $(TOP)/include` -# Dummy install target -install: +pcedit = sed \ + -e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \ + -e 's,@LIB_DIR@,$(LIB_DIR),' \ + -e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' + +gl.pc: gl.pc.in + $(pcedit) $< > $@ + +install: $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) gl.pc + $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL + $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR) + $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig + $(INSTALL) -m 644 $(TOP)/include/GL/*.h $(DESTDIR)$(INSTALL_DIR)/include/GL + $(INSTALL) $(TOP)/$(LIB_DIR)/libGL* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR); \ + $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig # Remove .o and backup files clean: diff --git a/src/mesa/gl.pc.in b/src/glx/x11/gl.pc.in index 4b144ffa4b2..4b144ffa4b2 100644 --- a/src/mesa/gl.pc.in +++ b/src/glx/x11/gl.pc.in diff --git a/src/mesa/Makefile b/src/mesa/Makefile index d0c78b71eed..87c5e6126de 100644 --- a/src/mesa/Makefile +++ b/src/mesa/Makefile @@ -132,15 +132,6 @@ $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECT ###################################################################### -# libGL pkg-config file -pcedit = sed \ - -e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \ - -e 's,@LIB_DIR@,$(LIB_DIR),' \ - -e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' -gl.pc: gl.pc.in - $(pcedit) $< > $@ - -###################################################################### # Generic stuff depend: $(ALL_SOURCES) @@ -160,15 +151,10 @@ subdirs: fi -install: default gl.pc +install: default $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR) - $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig $(INSTALL) -m 644 $(TOP)/include/GL/*.h $(DESTDIR)$(INSTALL_DIR)/include/GL - @if [ -e $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) ]; then \ - $(INSTALL) $(TOP)/$(LIB_DIR)/libGL* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR); \ - fi - $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig @if [ -e $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) ]; then \ $(INSTALL) $(TOP)/$(LIB_DIR)/libOSMesa* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR); \ fi |