Move stubs.h to caca/caca_stubs.h since it's only used by the library.

Makefile.am

@@ -3,7 +3,7 @@
 SUBDIRS = kernel caca src examples tests tools csharp cxx python ruby doc
 DIST_SUBDIRS = $(SUBDIRS) msvc
 
-EXTRA_DIST = NOTES COPYING.GPL COPYING.LGPL bootstrap build-dos build-kernel build-win32 caca-config.in stubs.h libcaca.spec
+EXTRA_DIST = NOTES COPYING.GPL COPYING.LGPL bootstrap build-dos build-kernel build-win32 caca-config.in libcaca.spec
 AUTOMAKE_OPTIONS = dist-bzip2
 
 bin_SCRIPTS = caca-config

caca/Makefile.am

@@ -17,6 +17,7 @@ libcaca_la_SOURCES = \
 	caca.h \
 	caca_types.h \
 	caca_internals.h \
+	caca_stubs.h \
 	caca0.c \
 	caca0.h \
 	canvas.c \

caca/caca_internals.h

@@ -15,7 +15,7 @@
 #ifndef __CACA_INTERNALS_H__
 #define __CACA_INTERNALS_H__
 
-#include "stubs.h"
+#include "caca_stubs.h"
 
 typedef struct caca_timer caca_timer_t;
 typedef struct caca_privevent caca_privevent_t;

msvc/libcaca.vcproj

@@ -311,17 +311,13 @@
 				>
 			</File>
 			<File
-				RelativePath="..\stubs.h"
+				RelativePath="..\caca\caca_stubs.h"
 				>
 			</File>
 			<File
 				RelativePath=".\config.h"
 				>
 			</File>
-			<File
-				RelativePath=".\stubs.h"
-				>
-			</File>
 		</Filter>
 	</Files>
 	<Globals>