summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2006-06-22 22:50:48 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2006-06-22 22:50:48 +0000
commit0e794a1bc6885cf569c3dc07b7fd56725aee2c2e (patch)
tree6535a05d50a72c91571c1c366a5f297451b9c8c7 /src
parentb4517527ebe9933cd3f49da29a9443c1abaa8242 (diff)
downloadexternal_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')
-rw-r--r--src/Makefile6
-rw-r--r--src/glu/Makefile3
-rw-r--r--src/glut/glx/Makefile7
-rw-r--r--src/glw/Makefile5
-rw-r--r--src/glx/x11/Makefile5
-rw-r--r--src/mesa/Makefile9
-rw-r--r--src/mesa/drivers/dri/Makefile.template5
7 files changed, 37 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile
index ffe2dbc..c6082e8 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -21,6 +21,12 @@ subdirs:
fi \
done
+install:
+ @for dir in $(SUBDIRS) ; do \
+ if [ -d $$dir ] ; then \
+ (cd $$dir ; $(MAKE) install) || exit 1 ; \
+ fi \
+ done
$(LIB_DIR):
-mkdir $(LIB_DIR)
diff --git a/src/glu/Makefile b/src/glu/Makefile
index 915b950..4e02e86 100644
--- a/src/glu/Makefile
+++ b/src/glu/Makefile
@@ -13,6 +13,9 @@ default: $(TOP)/configs/current
(cd $$dir ; $(MAKE)) ; \
done
+install:
+ $(INSTALL) -d $(INSTALL_DIR)/lib
+ $(COPY_LIBS) $(TOP)/lib/libGLU.* $(INSTALL_DIR)/lib
clean:
@for dir in $(SUBDIRS) ; do \
diff --git a/src/glut/glx/Makefile b/src/glut/glx/Makefile
index 86920ab..49c775f 100644
--- a/src/glut/glx/Makefile
+++ b/src/glut/glx/Makefile
@@ -96,6 +96,13 @@ $(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS)
$(GLUT_LIB_DEPS) $(OBJECTS)
+install:
+ $(INSTALL) -d $(INSTALL_DIR)/include/GL
+ $(INSTALL) -d $(INSTALL_DIR)/lib
+ $(INSTALL) -m 644 $(TOP)/include/GL/glut.h $(INSTALL_DIR)/include/GL
+ $(COPY_LIBS) $(TOP)/lib/libglut* $(INSTALL_DIR)/lib
+
+
clean:
-rm -f *.o *~
-rm -f *.lo
diff --git a/src/glw/Makefile b/src/glw/Makefile
index e21cbbd..af25f7d 100644
--- a/src/glw/Makefile
+++ b/src/glw/Makefile
@@ -25,6 +25,11 @@ OBJECTS = $(GLW_SOURCES:.c=.o)
default: $(LIB_DIR)/$(GLW_LIB_NAME)
+install:
+ $(INSTALL) -d $(INSTALL_DIR)/include/GL
+ $(INSTALL) -d $(INSTALL_DIR)/lib
+ $(INSTALL) -m 644 *.h $(INSTALL_DIR)/include/GL
+ $(COPY_LIBS) $(TOP)/lib/libGLw.* $(INSTALL_DIR)/lib
clean:
-rm depend depend.bak
diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile
index 977967a..b33a84e 100644
--- a/src/glx/x11/Makefile
+++ b/src/glx/x11/Makefile
@@ -1,7 +1,8 @@
TOP = ../../..
include $(TOP)/configs/current
-EXTRA_DEFINES = -DXF86VIDMODE -D_REENTRANT -UIN_DRI_DRIVER
+EXTRA_DEFINES = -DXF86VIDMODE -D_REENTRANT -UIN_DRI_DRIVER \
+ -DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_INSTALL_DIR)\"
SOURCES = \
glcontextmodes.c \
@@ -82,6 +83,8 @@ depend: $(SOURCES) $(MESA_GLAPI_SOURCES) $(MESA_ASM_API) Makefile
tags:
etags `find . -name \*.[ch]` `find ../include`
+# Dummy install target
+install:
# Remove .o and backup files
clean:
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