rearrange code to make button actions a bit more interruptibility-proof

[inkscape.git] / Makefile.mingw

diff --git a/Makefile.mingw b/Makefile.mingw
index 9be387a553a068e1a37f5afa7ba780485b3ed36b..81d7491d6337d9481fad13580aaee73cbeb44b7f 100644 (file)
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -2,7 +2,7 @@
 
 include ./Makefile.mingw.common
 
-all:   generated required
+all:   generated
        $(MAKE) -C po  -f Makefile.mingw
        $(MAKE) -C src -f Makefile.mingw
 
@@ -10,32 +10,27 @@ all:        generated required
 # G E N E R A T E D    F I L E S
 ###################################
 
-generated: config.h $(GTKDOS)$(S)bin$(S)intl.dll
+generated: config.h src$(S)make.dep $(GTKDOS)$(S)bin$(S)intl.dll
        
 config.h: config.h.mingw
        $(CP) config.h.mingw config.h
        
+src$(S)deptool.exe: src$(S)deptool.cpp
+       cd src && $(CXX) -g -Wall -o deptool.exe deptool.cpp
+
+src$(S)make.dep: src$(S)deptool.exe
+       cd src && deptool.exe
+
 $(GTKDOS)$(S)bin$(S)intl.dll:
        $(CP) $(GTKDOS)$(S)bin$(S)libintl-2.dll $(GTKDOS)$(S)bin$(S)intl.dll
 
 ###################################
-# R E Q U I R E D    F I L E S
+# 
 ###################################
 
-required: src$(S)make.files src$(S)make.ofiles src$(S)make.dep
-
-src$(S)make.files:
-       cd src && $(GTKDOS)$(S)perl$(S)bin$(S)perl mkfiles.pl
-       
-src$(S)make.ofiles:
-       cd src && $(GTKDOS)$(S)perl$(S)bin$(S)perl mkdep.pl
-       
-src$(S)make.dep:
-       cd src && $(GTKDOS)$(S)perl$(S)bin$(S)perl mkdep.pl
-
 dist-strip: dist
        strip inkscape$(S)inkscape.exe
-       strip inkscape$(S)inkview.exe
+#      strip inkscape$(S)inkview.exe
        strip inkscape$(S)libatkmm-1.6-1.dll
        strip inkscape$(S)libglibmm-2.4-1.dll
        strip inkscape$(S)libgdkmm-2.4-1.dll
@@ -69,15 +64,17 @@ dist-strip: dist
        strip inkscape$(S)perl58.dll
        strip inkscape$(S)python24.dll
        strip inkscape$(S)liblcms-1.dll
+       strip inkscape$(S)libloudmouth-1-0.dll
        -$(RM) inkscape$(S)gdb.exe
        
-dist:  generated required
+dist:  generated
        $(MAKE) -C src -f Makefile.mingw
        -$(RMDIR) inkscape
        $(MKDIR) inkscape
        $(CP) src$(S)inkscape.exe inkscape
        $(CP) src$(S)inkscape.dbg inkscape
 #      $(CP) src$(S)inkview.exe inkscape
+#      $(CP) src$(S)inkview.dbg inkscape
        $(CP) AUTHORS inkscape
        $(CP) COPYING inkscape
        $(CP) COPYING.LIB inkscape
@@ -114,12 +111,14 @@ dist:     generated required
        $(CP) $(GTKDOS)$(S)bin$(S)libtiff3.dll inkscape
        $(CP) $(GTKDOS)$(S)bin$(S)libpng13.dll inkscape
        $(CP) $(GTKDOS)$(S)bin$(S)msvcr70.dll inkscape
+       $(CP) $(GTKDOS)$(S)bin$(S)msvcr71.dll inkscape
        $(CP) $(GTKDOS)$(S)bin$(S)zlib1.dll inkscape
        $(CP) $(GTKDOS)$(S)bin$(S)iconv.dll inkscape
        $(CP) $(GTKDOS)$(S)bin$(S)libintl-2.dll inkscape
        $(CP) $(GTKDOS)$(S)bin$(S)libintl-2.dll inkscape$(S)intl.dll
        $(CP) $(GTKDOS)$(S)bin$(S)popt1.dll inkscape
        $(CP) $(GTKDOS)$(S)bin$(S)liblcms-1.dll inkscape
+       $(CP) $(GTKDOS)$(S)bin$(S)libloudmouth-1-0.dll inkscape
 #
 #       PERL
 #
@@ -158,6 +157,7 @@ dist:       generated required
        $(MKDIR) inkscape$(S)plugins
        -$(CP) src$(S)extension$(S)plugin$(S)*.dll inkscape$(S)plugins
        $(CP) $(GTKDOS)$(S)bin$(S)gdb.exe inkscape
+       $(CP) packaging$(S)win32$(S)inkscape.bat inkscape
 #
 #       remove unneeded files
 #
@@ -170,16 +170,16 @@ dist:     generated required
        -$(RMDIR) inkscape$(S)lib$(S)gtk-2.0$(S)include
        @echo "##################### D O N E ####################"
 
-clean: required
+clean: 
        -$(RMDIR) inkscape
        -$(RM) inkscape*.zip
        $(MAKE) -C src -f Makefile.mingw clean
        $(MAKE) -C po  -f Makefile.mingw clean
        -$(RM) src$(S)make.files
-       -$(RM) src$(S)make.ofiles
+       -$(RM) src$(S)make.ref
        -$(RM) src$(S)make.dep
 
-minimal:       generated required
+minimal:  generated
        $(MAKE) -C src -f Makefile.mingw
        -$(RM) inkscape$(S)inkscape.exe
        $(CP) src$(S)inkscape.exe inkscape