diff options
| author | Bob Jamison <ishmalius@gmail.com> | 2006-06-20 01:47:46 +0000 |
|---|---|---|
| committer | ishmal <ishmal@users.sourceforge.net> | 2006-06-20 01:47:46 +0000 |
| commit | adc38d4b1e1ce948daee0d01e7679fa2c826f039 (patch) | |
| tree | 79f2f76a18de35c82df202754b1848a6173285fd | |
| parent | switch from mkdep to deptool (diff) | |
| download | inkscape-adc38d4b1e1ce948daee0d01e7679fa2c826f039.tar.gz inkscape-adc38d4b1e1ce948daee0d01e7679fa2c826f039.zip | |
switch to deptool
(bzr r1242)
| -rw-r--r-- | Makefile.mingw | 27 | ||||
| -rw-r--r-- | Makefile.mingw.common | 12 |
2 files changed, 17 insertions, 22 deletions
diff --git a/Makefile.mingw b/Makefile.mingw index d70438c69..57662b73e 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,11 +10,17 @@ 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 @@ -22,17 +28,6 @@ $(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 @@ -72,7 +67,7 @@ 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 @@ -179,10 +174,10 @@ clean: required $(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 diff --git a/Makefile.mingw.common b/Makefile.mingw.common index 798589238..70a2bcd9d 100644 --- a/Makefile.mingw.common +++ b/Makefile.mingw.common @@ -83,10 +83,10 @@ else # NATIVE COMPILER SETTINGS ########################################################################## -CC = mingw32-gcc -CXX = mingw32-g++ +CC = i686-pc-mingw32-gcc +CXX = i686-pc-mingw32-g++ AS = as -AR = mingw32-ar +AR = i686-pc-mingw32-ar OBJCOPY = objcopy RANLIB = ranlib WINDRES = windres @@ -143,12 +143,12 @@ VERSION_NR = 0.44+devel VERSION = \"$(VERSION_NR)\" ####### the XP_WIN def is necessary for libjs.a -CFLAGS = -g -O3 -Wall -mms-bitfields -DVERSION=$(VERSION) \ +CFLAGS = -O3 -Wall -mms-bitfields -DVERSION=$(VERSION) \ -DXP_WIN -D_INTL_REDIRECT_INLINE -DHAVE_CONFIG_H ####### Inkboard abilities. ####### You must 'make -f Makefile.mingw clean' when turning this on or off -#CFLAGS += -DWITH_INKBOARD +CFLAGS += -DWITH_INKBOARD ####### IMPLICIT RULES .cpp.o: @@ -205,12 +205,12 @@ $(PERLINC) $(PYTHONINC) -I$(GTK)/include/loudmouth-1.0 \ # To enable loudmouth uncomment and move this line below -#-lloudmouth-1.dll -lssl -lcrypto LIBS = $(GTKLIB) $(PERLLIB) $(PYTHONLIB) \ $(GTK)/bin/libxml2.dll \ $(GTK)/lib/iconv.lib \ -lfreetype.dll -lfontconfig.dll \ -llcms.dll \ +-lloudmouth-1.dll -lssl -lcrypto \ -lpng -lpopt $(GTK)/lib/zdll.lib \ -lgc -mwindows -lws2_32 -lintl |