From 12d60187faf90596c585fc6c9fdff34915883543 Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Thu, 16 Oct 2008 23:44:49 +0000
Subject: [PATCH] Minor build system cosmetic changes.

---
 Makefile.am       | 2 +-
 src/Makefile.am   | 2 +-
 win32/Makefile.am | 6 +-----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 831d7ae..fa04453 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@
 SUBDIRS = kernel caca src examples tests tools caca-sharp cxx python ruby doc
 DIST_SUBDIRS = $(SUBDIRS) win32
 
-EXTRA_DIST = NOTES COPYING.GPL COPYING.LGPL bootstrap build-dos build-kernel build-win32 caca-config.in libcaca.spec
+EXTRA_DIST = NOTES COPYING.GPL COPYING.LGPL bootstrap build-dos build-kernel build-win32 caca-config.in libcaca.spec libcaca.sln
 AUTOMAKE_OPTIONS = dist-bzip2
 
 bin_SCRIPTS = caca-config
diff --git a/src/Makefile.am b/src/Makefile.am
index ba82516..4e4969a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,7 @@ pkgdata_DATA = caca.txt
 
 EXTRA_DIST = caca.txt cacademo.vcproj cacafire.vcproj cacaview.vcproj
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/caca -I../caca \
-              -I$(top_srcdir)/caca -DLIBCACA=1 -DX_DISPLAY_MISSING=1
+              -DLIBCACA=1 -DX_DISPLAY_MISSING=1
 
 bin_PROGRAMS = cacademo cacafire cacaplay cacaview img2txt $(fcntl_programs)
 noinst_PROGRAMS = cacadraw
diff --git a/win32/Makefile.am b/win32/Makefile.am
index a384179..3865a1e 100644
--- a/win32/Makefile.am
+++ b/win32/Makefile.am
@@ -1,8 +1,4 @@
 # $Id$
 
-NULL =
-
-EXTRA_DIST = config.h \
-             caca_types.h \
-             $(NULL)
+EXTRA_DIST = config.h caca_types.h