diff options
| author | Thierry Reding <[email protected]> | 2006-10-14 15:11:31 +0000 |
|---|---|---|
| committer | Thierry Reding <[email protected]> | 2006-10-14 15:11:31 +0000 |
| commit | d29244d8720c95f9e9869a51360902132b4b9c7e (patch) | |
| tree | 4b1b849b6d33e65e5449c1fb417f3fcb3efc753a /debian | |
| parent | 0fca6eda1e9c0bc120eab95c3f79a504d9d3e316 (diff) | |
Add OSMesa configurations and made fixed several issues here and there.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/libglu1-mesa-dev.install | 1 | ||||
| -rw-r--r-- | debian/mesa-common-dev.install | 4 | ||||
| -rwxr-xr-x | debian/rules | 15 |
3 files changed, 15 insertions, 5 deletions
diff --git a/debian/libglu1-mesa-dev.install b/debian/libglu1-mesa-dev.install index f8973bf1d69..abada7c1aec 100644 --- a/debian/libglu1-mesa-dev.install +++ b/debian/libglu1-mesa-dev.install @@ -1,2 +1,3 @@ usr/include/GL/glu.h usr/include/GL/glu_mangle.h +usr/lib/libGLU.so diff --git a/debian/mesa-common-dev.install b/debian/mesa-common-dev.install index e69de29bb2d..7c104927712 100644 --- a/debian/mesa-common-dev.install +++ b/debian/mesa-common-dev.install @@ -0,0 +1,4 @@ +usr/include/GL/gl.h +usr/include/GL/glext.h +usr/include/GL/osmesa.h +usr/include/GL/gl_mangle.h diff --git a/debian/rules b/debian/rules index 90e176e0b83..093efc14a90 100755 --- a/debian/rules +++ b/debian/rules @@ -26,10 +26,15 @@ DEB_BUILD_DIR ?= $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE) STAMPDIR = debian/stamp +# build the following configurations CONFIGS = debian \ - debian-dri + debian-dri \ + debian-osmesa16 \ + debian-osmesa16-static \ + debian-osmesa32 \ + debian-osmesa32-static -STAMP = $(STAMPDIR)/$(DEB_BUILD_GNU_TYPE)- +STAMP = $(STAMPDIR)/$(DEB_BUILD_GNU_TYPE) BUILD_STAMPS = $(addprefix $(STAMP)-build-, $(CONFIGS)) INSTALL_STAMPS = $(addprefix $(STAMP)-install-, $(CONFIGS)) @@ -42,14 +47,14 @@ $(STAMP)-build-%: dh_testdir mkdir -p $(DEB_BUILD_DIR)/$* find $(CURDIR)/* -maxdepth 0 -not -path '$(DEB_BUILD_DIR)*' | xargs cp -rl -t $(DEB_BUILD_DIR)/$* - ln -s $* $(DEB_BUILD_DIR)/$*/configs/current + ln -sf $* $(DEB_BUILD_DIR)/$*/configs/current cd $(DEB_BUILD_DIR)/$* && $(MAKE) touch $@ pre-install: dh_testdir dh_testroot - dh_clean -k --exclude ./Makefile.orig + dh_clean -k --exclude ./Makefile.orig --exclude configs/CVS/Root.bak dh_installdirs install: build pre-install $(INSTALL_STAMPS) @@ -62,7 +67,7 @@ clean: dh_testdir dh_testroot rm -rf $(DEB_BUILD_DIR) debian/stamp - dh_clean --exclude ./Makefile.orig + dh_clean --exclude ./Makefile.orig --exclude configs/CVS/Root.bak # Build architecture-independent files here. binary-indep: build install |