handle unhandled case in sp_color_rgb_to hsv_floatv(), removes assert warnings when...

[inkscape.git] / Makefile.mingw

diff --git a/Makefile.mingw b/Makefile.mingw
index 0df1434d11f286851dce87cd808d08299b4364e4..d70438c69b1e5896b0e0d147b7c3d8ec4cd6061d 100644 (file)
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -2,25 +2,38 @@
 
 include ./Makefile.mingw.common
 
-
-all:   config.h $(GTKDOS)$(S)bin$(S)intl.dll
+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
+       
+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
-       -$(RMDIRREC) CVS $(RMDIRREC1)
-       -$(RMREC) .cvsignore $(RMREC1)
-       -$(RMREC) Makefile $(RMREC1)
-       -$(RMREC) Makefile.am $(RMREC1)
-       -$(RMREC) Makefile.in $(RMREC1)
-       -$(RMDIR) inkscape$(S)lib$(S)glib-2.0$(S)include
-       -$(RMDIR) inkscape$(S)lib$(S)gtk-2.0$(S)include
        strip inkscape$(S)inkscape.exe
        strip inkscape$(S)inkview.exe
        strip inkscape$(S)libatkmm-1.6-1.dll
@@ -55,14 +68,18 @@ dist-strip: dist
        strip inkscape$(S)popt1.dll
        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:
+dist:  generated required
        $(MAKE) -C src -f Makefile.mingw
        -$(RMDIR) inkscape
        $(MKDIR) inkscape
        $(CP) src$(S)inkscape.exe inkscape
-#      $(CP) src$(S)inkview.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
@@ -104,6 +121,8 @@ dist:
        $(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
 #
@@ -142,15 +161,28 @@ dist:
        $(MKDIR) inkscape$(S)plugins
        -$(CP) src$(S)extension$(S)plugin$(S)*.dll inkscape$(S)plugins
        $(CP) $(GTKDOS)$(S)bin$(S)gdb.exe inkscape
+#
+#       remove unneeded files
+#
+       -$(RMDIRREC) .svn $(RMDIRREC1)
+       -$(RMREC) .cvsignore $(RMDIRREC1)
+       -$(RMREC) Makefile $(RMREC1)
+       -$(RMREC) Makefile.am $(RMREC1)
+       -$(RMREC) Makefile.in $(RMREC1)
+       -$(RMDIR) inkscape$(S)lib$(S)glib-2.0$(S)include
+       -$(RMDIR) inkscape$(S)lib$(S)gtk-2.0$(S)include
        @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