diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2006-06-22 22:50:48 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2006-06-22 22:50:48 +0000 |
| commit | 0e794a1bc6885cf569c3dc07b7fd56725aee2c2e (patch) | |
| tree | 6535a05d50a72c91571c1c366a5f297451b9c8c7 /src/mesa | |
| parent | b4517527ebe9933cd3f49da29a9443c1abaa8242 (diff) | |
| download | external_mesa3d-0e794a1bc6885cf569c3dc07b7fd56725aee2c2e.zip external_mesa3d-0e794a1bc6885cf569c3dc07b7fd56725aee2c2e.tar.gz external_mesa3d-0e794a1bc6885cf569c3dc07b7fd56725aee2c2e.tar.bz2 | |
New 'install' targets in makefile. See bug 2372.
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/Makefile | 9 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/Makefile.template | 5 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile index 8896bb2..5f171f4 100644 --- a/src/mesa/Makefile +++ b/src/mesa/Makefile @@ -149,11 +149,20 @@ subdirs: install: default + $(INSTALL) -d $(INSTALL_DIR)/include/GL + $(INSTALL) -d $(INSTALL_DIR)/lib + $(INSTALL) -m 644 $(TOP)/include/GL/*.h $(INSTALL_DIR)/include/GL + $(COPY_LIBS) $(TOP)/lib/libGL.* $(INSTALL_DIR)/lib @if [ "${DRIVER_DIRS}" = "dri" ] ; then \ cd drivers/dri ; $(MAKE) install ; \ fi + ## NOT YET: + ## $(INSTALL) -d $(INSTALL_DIR)/include/GLES + ## $(INSTALL) -m 644 include/GLES/*.h $(INSTALL_DIR)/include/GLES + + # Emacs tags tags: etags `find . -name \*.[ch]` $(TOP)/include/GL/*.h diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template index 4a7a655..9d08c44 100644 --- a/src/mesa/drivers/dri/Makefile.template +++ b/src/mesa/drivers/dri/Makefile.template @@ -70,7 +70,7 @@ default: depend symlinks $(LIBNAME) $(LIB_DIR)/$(LIBNAME) # $(TOP)/bin/mklib -o $(LIBNAME) -noprefix -install $(LIB_DIR) \ # $(WINLIB) $(LIB_DEPS) $(WINOBJ) $(MESA_MODULES) $(OBJECTS) -$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template +$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template $(TOP)/bin/mklib -noprefix -o $@ \ $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS) @@ -99,6 +99,7 @@ clean: -rm -f depend depend.bak install: $(LIBNAME) - install $(LIBNAME) /usr/X11R6/lib/modules/dri/$(LIBNAME) + $(INSTALL) -d $(DRI_DRIVER_INSTALL_DIR) + $(INSTALL) -m 755 $(LIBNAME) $(DRI_DRIVER_INSTALL_DIR) include depend |