Moved everything in the right place. Cleaner now.

1 files changed, 18 insertions, 17 deletions

diff --git a/Makefile b/Makefile
index f8e9ad3..1d95ce6 100755
--- a/Makefile
+++ b/Makefile
@@ -1,39 +1,40 @@
 #!/usr/bin/make -f
 
-CPPFLAGS=-Wall -g -O3 -mcpu=i686 -pedantic -pedantic-errors -Werror
+CPPFLAGS=-Wall -g -O3 -mcpu=i686 -pedantic -pedantic-errors -Werror -Iincludes `sdl-config --cflags`
+LDFLAGS=`sdl-config --libs`
 CXX=g++
 
-SUBDIRS = psxdev Xenogears VP MegamanX5
-TARGET = lzss dlzss cd-tool str-tool crypto-search bgrep
+SUBDIRS = psxdev lib Xenogears VP MegamanX5
+TARGET = lzss dlzss cd-tool str-player crypto-search bgrep dte-tool
 
 all: subdirs ${TARGET}
 
 subdirs:
 	for d in ${SUBDIRS} ; do make -C $$d || exit -1 ; done
 
-lzss: lzss.o lzss.h generic.o generic.h fileutils.h fileutils.o lzss-main.o Makefile
-	${CXX} ${LDFLAGS} -DLZSS_MAIN lzss.o generic.o fileutils.o lzss-main.o -o lzss
+lzss: lib/lzss.o includes/lzss.h lib/generic.o includes/generic.h includes/fileutils.h lib/fileutils.o lzss-main.o Makefile
+	${CXX} ${LDFLAGS} -DLZSS_MAIN lib/lzss.o lib/generic.o lib/fileutils.o lzss-main.o -o lzss
 
 dlzss: lzss Makefile
 	ln -fs lzss dlzss
 
-yazedc: yazedc.o crctables crctable.out yazedc-main.o Makefile
-	${CXX} ${LDFLAGS} yazedc.o yazedc-main.o -DMAIN -o yazedc
+yazedc: lib/yazedc.o lib/crctables lib/crctable.out yazedc-main.o Makefile
+	${CXX} ${LDFLAGS} lib/yazedc.o yazedc-main.o -DMAIN -o yazedc
 
-cd-tool: cd-tool.o cdutils.o cdutils.h fileutils.o fileutils.h generic.o generic.h yazedc.o yazedc.h Makefile
-	${CXX} ${LDFLAGAS} cd-tool.o cdutils.o fileutils.o yazedc.o generic.o -o cd-tool
+cd-tool: cd-tool.o lib/cdutils.o includes/cdutils.h lib/fileutils.o includes/fileutils.h lib/generic.o includes/generic.h lib/yazedc.o includes/yazedc.h Makefile
+	${CXX} ${LDFLAGAS} cd-tool.o lib/cdutils.o lib/fileutils.o lib/yazedc.o lib/generic.o -o cd-tool
 
-dte-tool: dteutils.o generic.h generic.o fileutils.o fileutils.h dtemain.o Makefile
-	${CXX} ${LDFLAGS} dteutils.o generic.o fileutils.o dtemain.o -o dte-tool
+dte-tool: lib/dteutils.o includes/generic.h lib/generic.o lib/fileutils.o includes/fileutils.h includes/dte.h dtemain.o Makefile
+	${CXX} ${LDFLAGS} lib/dteutils.o lib/generic.o lib/fileutils.o dtemain.o -o dte-tool
 
-str-tool: str-util.o generic.h generic.o fileutils.o fileutils.h cdutils.o cdutils.h yazedc.o yazedc.h Makefile
-	${CXX} ${LDFLAGS} str-util.o generic.o fileutils.o cdutils.o yazedc.o psxdev/bs.o psxdev/idctfst.o psxdev/jfdctint.o psxdev/vlc.o psxdev/xadecode.o -o str-tool -lSDL
+str-player: str-player.o includes/generic.h lib/generic.o lib/fileutils.o includes/fileutils.h lib/cdutils.o includes/cdutils.h lib/yazedc.o includes/yazedc.h Makefile
+	${CXX} ${LDFLAGS} str-player.o lib/generic.o lib/fileutils.o lib/cdutils.o lib/yazedc.o psxdev/bs.o psxdev/idctfst.o psxdev/jfdctint.o psxdev/vlc.o psxdev/xadecode.o -o str-player
 
-crypto-search: crypto-search.o generic.h generic.o fileutils.o fileutils.h Makefile
-	${CXX} ${LDFLAGS} crypto-search.o generic.o fileutils.o -o crypto-search
+crypto-search: crypto-search.o includes/generic.h lib/generic.o lib/fileutils.o includes/fileutils.h Makefile
+	${CXX} ${LDFLAGS} crypto-search.o lib/generic.o lib/fileutils.o -o crypto-search
 
-bgrep: bgrep.o generic.h generic.o fileutils.h fileutils.o Makefile
-	${CXX} ${LDFLAGS} bgrep.o generic.o fileutils.o -o bgrep
+bgrep: bgrep.o includes/generic.h lib/generic.o includes/fileutils.h lib/fileutils.o Makefile
+	${CXX} ${LDFLAGS} bgrep.o lib/generic.o lib/fileutils.o -o bgrep
 
 clean:
 	for d in ${SUBDIRS} ; do make -C $$d clean || exit -1 ; done