From http://www.jwz.org/xscreensaver/xscreensaver-5.24.tar.gz

[xscreensaver] / hacks / glx / Makefile.in

diff --git a/hacks/glx/Makefile.in b/hacks/glx/Makefile.in
index c58c98cc76475989cfa78ab22052c182f632daf9..4950ddce94fbe5fd828a77f923d79330e9c11086 100644 (file)
--- a/hacks/glx/Makefile.in
+++ b/hacks/glx/Makefile.in
@@ -446,7 +446,7 @@ check_men:
 
 validate_xml:
        @echo "Validating XML..." ; \
-       cd $(HACK_SRC) ; ./check-configs.pl $(EXES)
+       cd $(HACK_SRC) ; ./check-configs.pl $(GL_EXES) $(GLE_EXES) $(SUID_EXES)
 
 distdepend:: check_men validate_xml
 
@@ -476,7 +476,7 @@ $(HACK_BIN)/xlockmore.o: $(HACK_SRC)/xlockmore.c
 
 # How we build object files in this directory.
 .c.o:
-       $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $(X_CFLAGS) $<
+       $(CC) -c $(INCLUDES) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS) $<
 
 
 # How to build the "xscreensaver-gl-helper" program, that lets the daemon
@@ -491,7 +491,7 @@ xscreensaver-gl-helper: $(HELPER_OBJS)
 # These hacks use a slightly-differently-compiled variant of xlockmore.c.
 # This is how to make the the other .o file from it.
 #
-XLM_CFLAGS=-DUSE_GL $(INCLUDES) $(DEFS) $(CFLAGS) $(X_CFLAGS)
+XLM_CFLAGS=-DUSE_GL $(INCLUDES) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS)
 xlockmore-gl.o: $(HACK_SRC)/xlockmore.c
        $(CC) -o $@ -c $(XLM_CFLAGS) $(HACK_SRC)/xlockmore.c