File foobillard-makefiles.diff of Package foobillard

Index: Makefile.am
===================================================================
--- Makefile.am.orig
+++ Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS  = src data
 RPMSPECS = foobillard.spec \
            foobillard-SDL.spec   
 
-
+man6_MANS = foobillard.6
 
 EXTRA_DIST = README.FONTS foobillardrc.example foobillard.6 $(RPMSPECS)
 
Index: src/Makefile.am
===================================================================
--- src/Makefile.am.orig
+++ src/Makefile.am
@@ -47,10 +47,6 @@ INCLUDES = -DNDEBUG -DDATA_DIRECTORY='"$
 #LIBDIR = /usr/X11R6/lib
 #INCDIR = /usr/X11R6/include
 
-#CC     = gcc
-#CXXFLAGS = -O6 -s
-#CFLAGS = -DXMESA -Wall -O3 -I$(INCDIR)
-#CFLAGS = -Wall -O3 -I$(INCDIR) `freetype-config --cflags`
 if USE_SDL
 SDL_CFLAGS = `sdl-config --cflags` -DUSE_SDL
 SDL_LIBS   = `sdl-config --libs`
@@ -79,7 +75,7 @@ else
 SOUND_CFLAGS =
 endif
 
-AM_CFLAGS = -Wall `freetype-config --cflags` ${SDL_CFLAGS} ${NVIDIA_CFLAGS} ${SOUND_CFLAGS} ${DEBUG_CFLAGS}
+AM_CFLAGS = $(CFLAGS) -Wall `freetype-config --cflags` ${SDL_CFLAGS} ${NVIDIA_CFLAGS} ${SOUND_CFLAGS} ${DEBUG_CFLAGS}
 
 #LIBS   = -L$(LIBDIR) -lglut -lGLU -lGL -lXext -lXaw -lm -lXi -lpng -lz
 #LIBS   = -L$(LIBDIR) -lglut -lGLU -lGL -lXext -lXaw -lm -lXi -lpng -lz