tweaked mingw makefiles to not stop if self-generated and included files are missing

diff --git a/Makefile.mingw b/Makefile.mingw
index 67117e41b24aeb9e944e8a6ad34d4e29a5905050..92a78cb6930668c8edf004a2bce10d538c084fc7 100644 (file)
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -2,17 +2,28 @@
 
 include ./Makefile.mingw.common
 
-
-all:   config.h $(GTKDOS)$(S)bin$(S)intl.dll src$(S)make.files src$(S)make.ofiles src$(S)make.dep
+all:   generated required
        $(MAKE) -C po  -f Makefile.mingw
        $(MAKE) -C src -f Makefile.mingw
 
+###################################
+# G E N E R A T E D    F I L E S
+###################################
+
+generated: config.h $(GTKDOS)$(S)bin$(S)intl.dll
+       
 config.h: config.h.mingw
        $(CP) config.h.mingw config.h
        
 $(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
        
@@ -21,7 +32,7 @@ src$(S)make.ofiles:
        
 src$(S)make.dep:
        cd src && $(GTKDOS)$(S)perl$(S)bin$(S)perl mkdep.pl
-       
+
 dist-strip: dist
        -$(RMDIRREC) .svn $(RMDIRREC1)
        -$(RMREC) Makefile $(RMREC1)
@@ -66,7 +77,7 @@ dist-strip: dist
        strip inkscape$(S)liblcms-1.dll
        -$(RM) inkscape$(S)gdb.exe
        
-dist:
+dist:  generated required
        $(MAKE) -C src -f Makefile.mingw
        -$(RMDIR) inkscape
        $(MKDIR) inkscape
@@ -155,13 +166,16 @@ dist:
        $(CP) $(GTKDOS)$(S)bin$(S)gdb.exe inkscape
        @echo "##################### D O N E ####################"
 
-clean:
+clean: required
        -$(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.dep
 
-minimal:
+minimal:       generated required
        $(MAKE) -C src -f Makefile.mingw
        -$(RM) inkscape$(S)inkscape.exe
        $(CP) src$(S)inkscape.exe inkscape

diff --git a/src/Makefile.mingw b/src/Makefile.mingw
index e3cdb784917f80698c19e58f51e366aa4fbbbd6b..d0f612a1e440b70ae574f5c919ee97549facd03e 100644 (file)
--- a/src/Makefile.mingw
+++ b/src/Makefile.mingw
@@ -121,5 +121,6 @@ clean:
        -$(RM) *.dll
        -$(RM) extension$(S)plugin$(S)*.o
        -$(RM) extension$(S)plugin$(S)*.dll
+       -$(RM) inkscape.exe inkview.exe inkscape.dbg inkview.dbg