callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build/win32: Fix 'make -jN dist'

Browse Source 
The recent changes to build/win32/vs9|10/Makefile.am fixed 'make distclean'
but broke 'make -jN dist', so fix that by listing the *.headers and using
that list as a dependency and to remove those files in one single command
right after we generate the gtk-install.vsprops template, so that we don't
have to worry about them in 'make distclean'.
This commit is contained in:
Chun-wei Fan
2015-09-23 18:31:22 +08:00
parent 86c75f36ed
commit 975e1cc41c
2 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
build/win32/vs10/Makefile.am
View File

@ -20,12 +20,14 @@ GENERATED_ITEMS = \
gailutil-3.vcxproj \
gailutil-3.vcxproj.filters \
gtk3-install.props \
gtk3-version-paths.props \
gdk3-broadway.vs10.headers \
gdk-3.vs10.headers \
gtk-3.vs10.headers \
gailutil-3.vs10.headers \
gdk3-win32.vs10.headers
gtk3-version-paths.props
MSVC10_HEADERS_LISTS = \
gdk3-win32.vs10.headers \
gdk3-broadway.vs10.headers \
gdk-3.vs10.headers \
gtk-3.vs10.headers \
gailutil-3.vs10.headers
EXTRA_DIST += \
README.txt \
@ -60,12 +62,8 @@ EXTRA_DIST += \
gtk3-version-paths.props.in \
$(GENERATED_ITEMS)
gtk3-install.props: $(top_srcdir)/build/win32/vs10/gtk3-install.propsin
gtk3-install.props: $(top_srcdir)/build/win32/vs10/gtk3-install.propsin $(MSVC10_HEADERS_LISTS)
$(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtk3-install.propsin >$@
rm gdk-3.vs10.headers
rm gdk3-win32.vs10.headers
rm gdk3-broadway.vs10.headers
rm gtk-3.vs10.headers
rm gailutil-3.vs10.headers
rm $(MSVC10_HEADERS_LISTS)
-include $(top_srcdir)/git.mk

22
build/win32/vs9/Makefile.am
View File

@ -1,5 +1,12 @@
include $(top_srcdir)/Makefile.decl
MSVC_HEADERS_LISTS = \
gdk3-win32.headers \
gdk3-broadway.headers \
gdk-3.headers \
gtk-3.headers \
gailutil-3.headers
GENERATED_ITEMS = \
gdk3-win32.vcproj \
gdk3-broadway.vcproj \
@ -11,12 +18,7 @@ GENERATED_ITEMS = \
gtk3-icon-browser.vcproj \
gailutil-3.vcproj \
gtk3-install.vsprops \
gtk3-version-paths.vsprops \
gdk3-win32.headers \
gailutil-3.headers \
gdk-3.headers \
gdk3-broadway.headers \
gtk-3.headers
gtk3-version-paths.vsprops
EXTRA_DIST += \
README.txt \
@ -41,13 +43,9 @@ EXTRA_DIST += \
gtk3-version-paths.vsprops.in \
$(GENERATED_ITEMS)
gtk3-install.vsprops: $(top_srcdir)/build/win32/vs9/gtk3-install.vspropsin
gtk3-install.vsprops: $(top_srcdir)/build/win32/vs9/gtk3-install.vspropsin $(MSVC_HEADERS_LISTS)
$(CPP) -P - <$(top_srcdir)/build/win32/vs9/gtk3-install.vspropsin >$@
rm gdk-3.headers
rm gdk3-win32.headers
rm gdk3-broadway.headers
rm gtk-3.headers
rm gailutil-3.headers
rm $(MSVC_HEADERS_LISTS)
DISTCLEANFILES = $(GENERATED_ITEMS)