Assorted patches for miniglx/linux-solo (Gavin Li <codeview@gmail.com>)

diff --git a/Makefile b/Makefile
index c73117866e32c08a129875df64124524547185d5..b7f9a0d43892feb223e15c2a5a16b3a1c140526e 100644 (file)
--- 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 87ff43ce569d1cdf86006163178c1dd76910be80..a73198a68ccdf51e8d027adcf1f6d33600f64820 100644 (file)
--- 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 (file)
index 0000000..f732f29
--- /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 96750d2c248b249d97d68e5a688e4b63d38f03ed..7ed2146d562607a4379ff7a1626ce35e806431fc 100644 (file)
--- 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*