st/python: Adapt to interface change.

[mesa.git] / src / glw / Makefile

diff --git a/src/glw/Makefile b/src/glw/Makefile
index c2e8e3046b541edf9de1328950f6b7a51fe5c05c..776b1aa5bfb9b5e678f5b4e0e68487dfaca8a6f2 100644 (file)
--- a/src/glw/Makefile
+++ b/src/glw/Makefile
@@ -17,7 +17,7 @@ OBJECTS = $(GLW_SOURCES:.c=.o)
 ##### RULES #####
 
 .c.o:
-       $(CC) -c $(INCDIRS) $(CFLAGS) $<
+       $(CC) -c $(INCDIRS) $(CFLAGS) $(GLW_CFLAGS) $<
 
 
 
@@ -30,7 +30,11 @@ pcedit = sed \
        -e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \
        -e 's,@INSTALL_LIB_DIR@,$(INSTALL_LIB_DIR),' \
        -e 's,@INSTALL_INC_DIR@,$(INSTALL_INC_DIR),' \
-       -e 's,@VERSION@,$(MAJOR).$(MINOR).$(TINY),'
+       -e 's,@VERSION@,$(MAJOR).$(MINOR).$(TINY),' \
+       -e 's,@GLW_PC_REQ_PRIV@,$(GLW_PC_REQ_PRIV),' \
+       -e 's,@GLW_PC_LIB_PRIV@,$(GLW_PC_LIB_PRIV),' \
+       -e 's,@GLW_PC_CFLAGS@,$(GLW_PC_CFLAGS),' \
+       -e 's,@GLW_LIB@,$(GLW_LIB),'
 glw.pc: glw.pc.in
        $(pcedit) $< > $@
 
@@ -39,7 +43,7 @@ install: glw.pc
        $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
        $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
        $(INSTALL) -m 644 *.h $(DESTDIR)$(INSTALL_INC_DIR)/GL
-       $(INSTALL) $(TOP)/$(LIB_DIR)/$(GLW_LIB_GLOB) $(DESTDIR)$(INSTALL_LIB_DIR)
+       $(MINSTALL) $(TOP)/$(LIB_DIR)/$(GLW_LIB_GLOB) $(DESTDIR)$(INSTALL_LIB_DIR)
        $(INSTALL) -m 644 glw.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
 
 clean:
@@ -67,4 +71,4 @@ depend: $(GLW_SOURCES)
                $(X11_INCLUDES) > /dev/null
 
 
-include depend
+-include depend