X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=installer%2FMakefile;h=c5220aace14358994b31ba8b80a3976b08d7f6a2;hb=9c9467f4d5c8a807b9a424431c374a2dc5d086e9;hp=9a3c7649273039d168b123890e6bdcd0b28375b5;hpb=dc3edb13b7ab579de51496193b78e8c26790d512;p=swftools.git

diff --git a/installer/Makefile b/installer/Makefile
index 9a3c764..c5220aa 100644
--- a/installer/Makefile
+++ b/installer/Makefile
@@ -4,16 +4,16 @@ WINDRES=/opt/xmingw/bin/i386-mingw32msvc-windres
 
 LICENSE=gpl.c
 
-all: files1.exe files2.exe
+all: files1.exe files2.exe mkarchive
 
 LIBS=-lgdi32 -lshlwapi -lcomctl32 -lshell32 -lole32 -luuid
 
-files1.c: ../win32/*.exe
+files1.c: ../win32/*.exe mkarchive
 	CWD=`pwd`
 	cd ../win32;../installer/mkarchive `find`
 	mv ../win32/crnfiles.c ./files1.c
 
-files2.c: ../win32_gui/*.exe ../win32_gui/*.swf
+files2.c: ../win32_gui/*.exe ../win32_gui/*.swf mkarchive
 	CWD=`pwd`
 	cd ../win32_gui;../installer/mkarchive `find`
 	mv ../win32_gui/crnfiles.c ./files2.c
@@ -21,26 +21,32 @@ files2.c: ../win32_gui/*.exe ../win32_gui/*.swf
 %.o: %.c
 	$(CC) -c $<
 
+mkarchive: mkarchive.c
+	gcc mkarchive.c -o mkarchive -lz
+
 crnfiles1.o: crnfiles1.c
 crnfiles2.o: crnfiles2.c
 
-depack.o: depack.c depack.h Makefile
-	$(CC) -c depack.c -o depack.o
+#depack.o: depack.c depack.h Makefile
+#	$(CC) -c depack.c -o depack.o
 
-archive.o: archive.c archive.c depack.h
+archive.o: archive.c archive.c
 	$(CC) -c archive.c -o archive.o
 
 license.o: $(LICENSE)
 	$(CC) -c $< -o license.o
 
-installer.o: installer.c installer.h depack.h archive.h ../lib/os.h
+installer.o: installer.c installer.h archive.h ../lib/os.h
 	$(CC) -c installer.c -o installer.o
 
 installer.coff: installer.rc swftools.ico installer.h
 	$(WINDRES) installer.rc -O coff -F pe-i386 -o installer.coff
 
-%.exe: %.c installer.o license.o depack.o archive.o depack.h installer.coff Makefile
-	$(CC) installer.o depack.o license.o archive.o installer.coff $< -o $@ $(LIBS)
+lzma/LzmaDecode.o: lzma/LzmaDecode.c lzma/LzmaDecode.h lzma/LzmaTypes.h
+	$(CC) -c lzma/LzmaDecode.c -o lzma/LzmaDecode.o
+
+%.exe: %.c installer.o license.o archive.o lzma/LzmaDecode.o installer.coff Makefile
+	$(CC) installer.o license.o archive.o lzma/LzmaDecode.o installer.coff $< -o $@ $(LIBS)
 	$(STRIP) $@
 	./makegui $@
 	#upx -9 --best $@ 2>/dev/null || true