use grep -q

[mesa.git] / src / mesa / Makefile

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index a50e826701b797645dcd00ed2adab80266ea574f..77bb7be48066d071f67ea10250611fb21df750c7 100644 (file)
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -65,7 +65,7 @@ linux-solo: depend subdirs libmesa.a
 # Stand-alone Mesa libGL, no built-in drivers (DirectFB)
 
 libgl-core: $(CORE_OBJECTS)
-       @ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \
+       @ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS) \
                -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
                -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) $(CORE_OBJECTS) \
                $(GL_LIB_DEPS)
@@ -78,7 +78,7 @@ directfb: depend subdirs libgl-core
 # fbdev Mesa driver (libGL.so)
 
 fbdev: $(CORE_OBJECTS) $(FBDEV_DRIVER_OBJECTS) $(COMMON_DRIVER_OBJECTS)
-       @ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \
+       @ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
                -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
                -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
                $(CORE_OBJECTS) $(FBDEV_DRIVER_OBJECTS) \
@@ -111,7 +111,7 @@ osmesa-only: depend subdirs $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)
 
 # Make the GL library
 $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS)
-       @ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \
+       @ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
                -major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \
                -install $(TOP)/$(LIB_DIR) \
                $(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(STAND_ALONE_OBJECTS)
@@ -120,19 +120,28 @@ $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS)
 $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS)
        @ if [ "${DRIVER_DIRS}" = "osmesa" ] ; then \
                $(TOP)/bin/mklib -o $(OSMESA_LIB) -linker '$(CC)' \
-                       -major $(MESA_MAJOR) \
+                       -ldflags '$(LDFLAGS)' -major $(MESA_MAJOR) \
                        -minor $(MESA_MINOR) -patch $(MESA_TINY) \
                        -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
                        $(OSMESA_LIB_DEPS) $(OSMESA16_OBJECTS) ; \
        else \
                $(TOP)/bin/mklib -o $(OSMESA_LIB) -linker '$(CC)' \
-                       -major $(MESA_MAJOR) \
+                       -ldflags '$(LDFLAGS)' -major $(MESA_MAJOR) \
                        -minor $(MESA_MINOR) -patch $(GL_TINY) \
                        -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
                        $(OSMESA_LIB_DEPS) $(OSMESA_DRIVER_OBJECTS) ; \
        fi
 
 
+######################################################################
+# libGL pkg-config file
+pcedit = sed \
+       -e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \
+       -e 's,@LIB_DIR@,$(LIB_DIR),' \
+       -e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),'
+gl.pc: gl.pc.in
+       $(pcedit) $< > $@
+
 ######################################################################
 # Generic stuff
 
@@ -144,17 +153,24 @@ depend: $(ALL_SOURCES)
 
 
 subdirs:
-       @ (cd x86 ; $(MAKE))
-       @ (cd x86-64 ; $(MAKE))
+       @ if echo "$(ASM_FLAGS)" | grep -q USE_X86_ASM ; then \
+               (cd x86 ; $(MAKE)) ; \
+       fi
+       @ if echo "$(ASM_FLAGS)" | grep -q USE_X86_64_ASM ; then \
+               (cd x86 ; $(MAKE)) ; \
+               (cd x86-64 ; $(MAKE)) ; \
+       fi
 
 
-install: default
+install: default gl.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/*.h $(DESTDIR)$(INSTALL_DIR)/include/GL
        @if [ -e $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) ]; then \
                $(INSTALL) $(TOP)/$(LIB_DIR)/libGL* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR); \
        fi
+       $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig
        @if [ -e $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) ]; then \
                $(INSTALL) $(TOP)/$(LIB_DIR)/libOSMesa* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR); \
        fi