diff options
| author | Adib Taraben <theadib@gmail.com> | 2006-04-06 21:58:43 +0000 |
|---|---|---|
| committer | theadib <theadib@users.sourceforge.net> | 2006-04-06 21:58:43 +0000 |
| commit | 556c0966b485e65aa4e264e1d7cad3e0187a4110 (patch) | |
| tree | 831715ee6d5cb2171c2575fc0133c3f30a012825 | |
| parent | add make.files make.ofiles make.dep as targets to the makefile.mingw (diff) | |
| download | inkscape-556c0966b485e65aa4e264e1d7cad3e0187a4110.tar.gz inkscape-556c0966b485e65aa4e264e1d7cad3e0187a4110.zip | |
tweaked mingw makefiles to not stop if self-generated and included files are missing
(bzr r453)
| -rw-r--r-- | Makefile.mingw | 26 | ||||
| -rw-r--r-- | src/Makefile.mingw | 1 |
2 files changed, 21 insertions, 6 deletions
diff --git a/Makefile.mingw b/Makefile.mingw index 67117e41b..92a78cb69 100644 --- 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 e3cdb7849..d0f612a1e 100644 --- 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 |