X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2FMakefile.in;h=762f8571ed005831347bc9286f975ea7b0b40ae6;hb=3f1091236d800c43a3124c44c7da54e53f205b13;hp=c58c98cc76475989cfa78ab22052c182f632daf9;hpb=2762a7d7cf8d83e68b8f635941f6609119d630ae;p=xscreensaver diff --git a/hacks/glx/Makefile.in b/hacks/glx/Makefile.in index c58c98cc..762f8571 100644 --- a/hacks/glx/Makefile.in +++ b/hacks/glx/Makefile.in @@ -235,7 +235,7 @@ RETIRED_MEN = glforestfire.man EXTRAS = README Makefile.in dxf2gl.pl vrml2gl.pl wfront2gl.pl \ molecules.sh starwars.txt -TARFILES = $(SRCS) $(HDRS) $(MEN) $(RETIRED_MEN) $(EXTRAS) +TARFILES = $(SRCS) $(HDRS) $(GL_MEN) $(RETIRED_MEN) $(EXTRAS) default: all @@ -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