# HG changeset patch
# User Eugene Zagidullin <e.asphyx@gmail.com>
# Date 1202617309 -10800
# Node ID af17e0fc8f08a11fadae8f22d72b27ac596762a1
# Parent  a41fb6bc632aa4eafd42b2d75134a7d5bdd195e7# Parent  9a55e82379881c9edb00410251bf1eb6a7757cba
Automated merge with ssh://hg.atheme.org//hg/audacious

diff -r a41fb6bc632a -r af17e0fc8f08 src/libSAD/Makefile
--- a/src/libSAD/Makefile	Sun Feb 10 07:19:45 2008 +0300
+++ b/src/libSAD/Makefile	Sun Feb 10 07:21:49 2008 +0300
@@ -3,7 +3,12 @@
        dither_ops.c \
        noicegen.c
 
+INCLUDES = libSAD.h \
+           common.h \
+           dither.h
+
 include ../../buildsys.mk
 include ../../extra.mk
 
-CPPFLAGS += ${SIMD_CFLAGS}
+PACKAGE = libSAD
+CPPFLAGS += ${SIMD_CFLAGS} -I../..
diff -r a41fb6bc632a -r af17e0fc8f08 src/libSAD/common.h
--- a/src/libSAD/common.h	Sun Feb 10 07:19:45 2008 +0300
+++ b/src/libSAD/common.h	Sun Feb 10 07:21:49 2008 +0300
@@ -17,8 +17,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef COMMON_H
-#define COMMON_H
+#ifndef LIBSAD_COMMON_H
+#define LIBSAD_COMMON_H
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -34,7 +34,9 @@
 #define FALSE 0
 #endif
 
-#include "../../config.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 typedef int SAD_error;
 
diff -r a41fb6bc632a -r af17e0fc8f08 src/libSAD/dither.h
--- a/src/libSAD/dither.h	Sun Feb 10 07:19:45 2008 +0300
+++ b/src/libSAD/dither.h	Sun Feb 10 07:21:49 2008 +0300
@@ -17,8 +17,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef DITHER_H
-#define DITHER_H
+#ifndef LIBSAD_DITHER_H
+#define LIBSAD_DITHER_H
 
 #include "common.h"