X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Makefile.mingw;h=dc827ca4e559786e2a65c923bce3e4e3bafc6b66;hb=24c6ddb693cb37e6e68798b6fff862d5968c5891;hp=ba437d40da06c8e77fc06702af30f5af42d153d2;hpb=0afa6c53936d0dd5bc22c3b67693c3a71754e986;p=inkscape.git

diff --git a/Makefile.mingw b/Makefile.mingw
index ba437d40d..dc827ca4e 100644
--- 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
 	
-$(GTKDOS)$(S)bin$(S)intl.dll:
-	$(CP) $(GTKDOS)$(S)bin$(S)libintl-2.dll $(GTKDOS)$(S)bin$(S)intl.dll
+src$(S)deptool.exe: src$(S)deptool.cpp
+	cd src && $(CXX) -g -Wall -o deptool.exe deptool.cpp
 
-###################################
-# R E Q U I R E D    F I L E S
-###################################
+src$(S)make.dep: src$(S)deptool.exe
+	cd src && deptool.exe
 
-required: src$(S)make.files src$(S)make.ofiles src$(S)make.dep
+$(GTKDOS)$(S)bin$(S)libintl-2.dll:
+	$(CP) $(GTKDOS)$(S)bin$(S)intl.dll $(GTKDOS)$(S)bin$(S)libintl-2.dll
 
-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
@@ -72,13 +67,14 @@ dist-strip: dist
 	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.exe inkscape
+	$(CP) src$(S)inkview.dbg inkscape
 	$(CP) AUTHORS inkscape
 	$(CP) COPYING inkscape
 	$(CP) COPYING.LIB inkscape
@@ -103,6 +99,7 @@ dist:	generated required
 	$(CP) $(GTKDOS)$(S)bin$(S)libgtk-win32-2.0-0.dll inkscape
 	$(CP) $(GTKDOS)$(S)bin$(S)libgthread-2.0-0.dll inkscape
 	$(CP) $(GTKDOS)$(S)bin$(S)libcairo-2.dll inkscape
+	$(CP) $(GTKDOS)$(S)bin$(S)libcairomm-1.0-1.dll inkscape
 	$(CP) $(GTKDOS)$(S)bin$(S)libpangocairo-1.0-0.dll inkscape
 	$(CP) $(GTKDOS)$(S)bin$(S)libpango-1.0-0.dll inkscape
 	$(CP) $(GTKDOS)$(S)bin$(S)libpangoft2-1.0-0.dll inkscape
@@ -115,13 +112,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)intl.dll inkscape
+	$(CP) $(GTKDOS)$(S)bin$(S)intl.dll inkscape$(S)libintl-2.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
+#	$(CP) $(GTKDOS)$(S)bin$(S)libloudmouth-1-0.dll inkscape
 #
 #       PERL
 #
@@ -147,7 +145,7 @@ dist:	generated required
 	$(CPDIR) $(GTKDOS)$(S)lib$(S)gtk-2.0 inkscape$(S)lib$(S)gtk-2.0
 	$(CPDIR) $(GTKDOS)$(S)lib$(S)glib-2.0 inkscape$(S)lib$(S)glib-2.0
 	$(CPDIR) $(GTKDOS)$(S)lib$(S)locale inkscape$(S)lib$(S)locale
-	$(CPDIR) $(GTKDOS)$(S)lib$(S)pango inkscape$(S)lib$(S)pango
+#	$(CPDIR) $(GTKDOS)$(S)lib$(S)pango inkscape$(S)lib$(S)pango
 #	$(MKDIR) inkscape$(S)fonts
 #	$(CP) $(GTKDOS)$(S)fonts$(S)*.ttf inkscape$(S)fonts
 	$(CPDIR) share inkscape$(S)share
@@ -160,6 +158,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
 #
@@ -172,16 +171,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