Merge branch 'horizontals'

[swftools.git] / wx / Makefile

diff --git a/wx/Makefile b/wx/Makefile
index 3ed15ef..e5cde64 100644 (file)
--- a/wx/Makefile
+++ b/wx/Makefile
@@ -6,13 +6,15 @@ include ../Makefile.common
 all: pdf2swf_gui.exe
 
 pdf2swf_gui.exe: gpdf2swf.py gui/*.py viewers/*.py
 all: pdf2swf_gui.exe
 
 pdf2swf_gui.exe: gpdf2swf.py gui/*.py viewers/*.py

-       cp gpdf2swf.py /xpython/main.py
-       cp -R viewers gui lib /xpython/
+       cp -a ../installer/swftools.ico /xpython/xpython.ico
+       cp -a gpdf2swf.py /xpython/main.py
+       cp -a -R viewers gui lib /xpython/

        cd /xpython/swftools;git pull
        cd /xpython;make xpython.exe
        ln -f /xpython/xpython.exe ./gpdf2swf.exe
        #ln -f gpdf2swf.exe ../win32_gui/
        ln -f gpdf2swf.exe ../win32/
        cp -R viewers/* ../win32/viewers/
        cd /xpython/swftools;git pull
        cd /xpython;make xpython.exe
        ln -f /xpython/xpython.exe ./gpdf2swf.exe
        #ln -f gpdf2swf.exe ../win32_gui/
        ln -f gpdf2swf.exe ../win32/
        cp -R viewers/* ../win32/viewers/

+       rm -rf ../win32/viewers/flexpaper* # we're not distributing flexpaper

 
 .PHONY: exe
 
 .PHONY: exe