Prlorf

1 files changed, 14 insertions, 14 deletions

diff --git a/Makefile b/Makefile
index b68b79b..04aaecb 100755
--- a/Makefile
+++ b/Makefile
@@ -12,29 +12,29 @@ all: subdirs ${TARGET}
 subdirs:
 	for d in ${SUBDIRS} ; do make -C $$d || exit -1 ; done
 
-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
+lzss: includes/lzss.h includes/generic.h includes/fileutils.h lzss-main.o generic/generic.a lib/lib.a Makefile
+	${CXX} ${LDFLAGS} -DLZSS_MAIN lzss-main.o lib/lib.a generic/generic.a -o lzss
 
 dlzss: lzss Makefile
 	ln -fs lzss dlzss
 
-yazedc: lib/yazedc.o lib/crctables lib/crctable.out yazedc-main.o Makefile
-	${CXX} ${LDFLAGS} lib/yazedc.o yazedc-main.o -DMAIN -o yazedc
+yazedc: yazedc-main.o lib/lib.a Makefile
+	${CXX} ${LDFLAGS} yazedc-main.o lib/lib.a -DMAIN -o yazedc
 
-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
+cd-tool: includes/cdutils.h includes/fileutils.h includes/generic.h includes/yazedc.h cd-tool.o Makefile
+	${CXX} ${LDFLAGAS} cd-tool.o lib/lib.a generic/generic.a -o cd-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
+dte-tool: includes/generic.h includes/fileutils.h includes/dte.h dtemain.o lib/lib.a generic/generic.a Makefile
+	${CXX} ${LDFLAGS} dtemain.o lib/lib.a generic/generic.a -o dte-tool
 
-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
+str-player: str-player.o includes/generic.h includes/fileutils.h includes/cdutils.h includes/yazedc.h lib/lib.a generic/generic.a psxdev/psxdev.a Makefile
+	${CXX} ${LDFLAGS} str-player.o psxdev/psxdev.a lib/lib.a generic/generic.a -o str-player
 
-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
+crypto-search: crypto-search.o includes/generic.h includes/fileutils.h lib/lib.a generic/generic.a Makefile
+	${CXX} ${LDFLAGS} crypto-search.o lib/lib.a generic/generic.a -o crypto-search
 
-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
+bgrep: bgrep.o includes/generic.h includes/fileutils.h generic/generic.a Makefile
+	${CXX} ${LDFLAGS} bgrep.o generic/generic.a -o bgrep
 
 clean:
 	for d in ${SUBDIRS} ; do make -C $$d clean || exit -1 ; done