Merged cptspiff's code-reshuffle branch.

Squashed commit due to build breakage during code-reshuffle history.

Conflicts:
	xbmc/Util.cpp
	xbmc/cdrip/CDDARipper.cpp
	xbmc/filesystem/Directory.cpp
	xbmc/filesystem/File.cpp

Author: theuni

.gitignore

@@ -32,6 +32,10 @@ CXXFLAGS+=@CXXFLAGS@
 CFLAGS+=@CFLAGS@
 LDFLAGS+=@LDFLAGS@
 INCLUDES+=$(sort @INCLUDES@)
+INCLUDES+=-I@abs_top_srcdir@/lib
+INCLUDES+=-I@abs_top_srcdir@/xbmc
+INCLUDES+=-I@abs_top_srcdir@/lib/ffmpeg
+INCLUDES+=-I@abs_top_srcdir@/xbmc/linux
 DEFINES+= \
 	-D_LINUX \
 	-D_FILE_DEFINED \
@@ -44,6 +48,7 @@ DEFINES+= \
 
 ifeq ($(findstring osx,$(ARCH)), osx)
 	export MACOSX_DEPLOYMENT_TARGET=10.4
+	INCLUDES+=-I@abs_top_srcdir@/xbmc/osx
 endif
 
 ifeq ($(ARCH), powerpc-osx)

Makefile.in

@@ -1,5 +1,5 @@
 TARGET=Textures.xbt
-XBMCTEX=../../../tools/TexturePacker/TexturePacker
+XBMCTEX=@abs_top_srcdir@/tools/TexturePacker/TexturePacker
 IMAGES= \
 	ArrowDown.png \
 	ArrowUp.png \
@@ -321,7 +321,7 @@ $(TARGET): $(XBMCTEX) $(IMAGES)
 	$(XBMCTEX) -input . -output $(TARGET)
 
 $(XBMCTEX): force
-	$(MAKE) -C ../../../tools/TexturePacker
+	$(MAKE) -C @abs_top_srcdir@/tools/TexturePacker
 
 clean:
 	rm -f $(TARGET)

Makefile.include.in

@@ -7,10 +7,10 @@ autoreconf -vif lib/cpluff
 # we must autoreconf libass as we don't know till later if it's used.
 [ -d lib/libass ] && autoreconf -vif lib/libass
 # order matters with libbdnav and friends
-[ -d xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss ] && \
-  autoreconf -vif xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss
-autoreconf -vif xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread
-autoreconf -vif xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav
+[ -d lib/libdvd/libdvdcss ] && \
+  autoreconf -vif lib/libdvd/libdvdcss
+autoreconf -vif lib/libdvd/libdvdread
+autoreconf -vif lib/libdvd/libdvdnav
 
 # Clean the generated files
 find . -depth -type d -name "autom4te.cache" -exec rm -rf {} \;