summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2008-01-23 16:03:19 -0700
committerBrian <brian.paul@tungstengraphics.com>2008-01-23 16:03:19 -0700
commit4875b4030490d7756d607d42821deed0035e1ec4 (patch)
tree269cbe2e2170e07e970e659558ecbe20917da8d8
parent2a077500a84819d1e6ac62e84ded130aa655c5e9 (diff)
Assorted patches for miniglx/linux-solo (Gavin Li <codeview@gmail.com>)
-rw-r--r--Makefile1
-rw-r--r--src/glut/mini/Makefile17
-rw-r--r--src/glut/mini/glut.pc.in11
-rw-r--r--src/glx/mini/Makefile4
4 files changed, 33 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index c73117866e3..b7f9a0d4389 100644
--- a/Makefile
+++ b/Makefile
@@ -424,6 +424,7 @@ GLUT_FILES = \
$(DIRECTORY)/src/glut/fbdev/Makefile \
$(DIRECTORY)/src/glut/fbdev/*[ch] \
$(DIRECTORY)/src/glut/mini/*[ch] \
+ $(DIRECTORY)/src/glut/mini/glut.pc.in \
$(DIRECTORY)/src/glut/directfb/Makefile \
$(DIRECTORY)/src/glut/directfb/NOTES \
$(DIRECTORY)/src/glut/directfb/*[ch] \
diff --git a/src/glut/mini/Makefile b/src/glut/mini/Makefile
index 87ff43ce569..a73198a68cc 100644
--- a/src/glut/mini/Makefile
+++ b/src/glut/mini/Makefile
@@ -72,6 +72,23 @@ tags:
etags `find . -name \*.[ch]` `find ../include`
+# glut pkgconfig file
+pcedit = sed \
+ -e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \
+ -e 's,@LIB_DIR@,$(LIB_DIR),' \
+ -e 's,@VERSION@,$(GLUT_MAJOR).$(GLUT_MINOR).$(GLUT_TINY),'
+glut.pc: glut.pc.in
+ $(pcedit) $< > $@
+
+install: glut.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/glut.h $(DESTDIR)$(INSTALL_DIR)/include/GL
+ $(INSTALL) $(TOP)/$(LIB_DIR)/libglut* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)
+ $(INSTALL) -m 644 glut.pc $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig
+
+
# Remove .o and backup files
clean: depend
-rm -f depend
diff --git a/src/glut/mini/glut.pc.in b/src/glut/mini/glut.pc.in
new file mode 100644
index 00000000000..f732f2990d0
--- /dev/null
+++ b/src/glut/mini/glut.pc.in
@@ -0,0 +1,11 @@
+prefix=@INSTALL_DIR@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/@LIB_DIR@
+includedir=${prefix}/include
+
+Name: glut
+Description: Mesa OpenGL Utility Toolkit library
+Requires: gl glu
+Version: @VERSION@
+Libs: -L${libdir} -lglut
+Cflags: -I${includedir}
diff --git a/src/glx/mini/Makefile b/src/glx/mini/Makefile
index 96750d2c248..7ed2146d562 100644
--- a/src/glx/mini/Makefile
+++ b/src/glx/mini/Makefile
@@ -75,6 +75,10 @@ tags:
etags `find . -name \*.[ch]` `find ../include`
+# Dummy install target
+install:
+
+
# Remove .o and backup files
clean:
-rm -f drmtest $(TOP)/$(LIB_DIR)/libGL.so*