luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-07-11 04:58:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

build/win32: Make "Install" Property Sheet Generation More Robust

Browse Source 
List the files that are generated in the process to generate the
glib-install property sheets, so that we can use that list as a
depedency, as well as deleting those files in one shot after the
property sheet is generated, so we don't need to worry about those
in 'make distclean' or so.
This commit is contained in:
Chun-wei Fan
2015-09-23 16:12:50 +08:00
parent b81f3ced71
commit aef2d0c56d
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,8 @@ GENERATED_ITEMS = \
glib-gen-srcs.props \ glib-gen-srcs.props \
glib-install.props glib-install.props
MSVC10_HEADERS_LIST = glib.vs10.headers gobject.vs10.headers gio.vs10.headers
EXTRA_DIST = \ EXTRA_DIST = \
README.txt \ README.txt \
glib.sln \ glib.sln \
@ -50,10 +52,8 @@ EXTRA_DIST = \
glib-gen-srcs.props.in \ glib-gen-srcs.props.in \
$(GENERATED_ITEMS) $(GENERATED_ITEMS)
glib-install.props: $(top_srcdir)/build/win32/vs10/glib-install.propsin glib.vs10.headers gobject.vs10.headers gio.vs10.headers glib-install.props: $(top_srcdir)/build/win32/vs10/glib-install.propsin $(MSVC10_HEADERS_LIST)
$(CPP) -P - <$(top_srcdir)/build/win32/vs10/glib-install.propsin >$@ $(CPP) -P - <$(top_srcdir)/build/win32/vs10/glib-install.propsin >$@
rm glib.vs10.headers rm $(MSVC10_HEADERS_LIST)
rm gobject.vs10.headers
rm gio.vs10.headers
DISTCLEANFILES = $(GENERATED_ITEMS) DISTCLEANFILES = $(GENERATED_ITEMS)

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

@ -7,6 +7,8 @@ GENERATED_ITEMS = \
glib-gen-srcs.vsprops \ glib-gen-srcs.vsprops \
glib-install.vsprops glib-install.vsprops
MSVC_HEADERS_LIST = glib.headers gobject.headers gio.headers
EXTRA_DIST = \ EXTRA_DIST = \
README.txt \ README.txt \
glib.sln \ glib.sln \
@ -31,10 +33,8 @@ EXTRA_DIST = \
glib-install.vspropsin \ glib-install.vspropsin \
$(GENERATED_ITEMS) $(GENERATED_ITEMS)
glib-install.vsprops: $(top_srcdir)/build/win32/vs9/glib-install.vspropsin glib.headers gobject.headers gio.headers glib-install.vsprops: $(top_srcdir)/build/win32/vs9/glib-install.vspropsin $(MSVC_HEADERS_LIST)
$(CPP) -P - <$(top_srcdir)/build/win32/vs9/glib-install.vspropsin >$@ $(CPP) -P - <$(top_srcdir)/build/win32/vs9/glib-install.vspropsin >$@
rm glib.headers rm $(MSVC_HEADERS_LIST)
rm gobject.headers
rm gio.headers
DISTCLEANFILES = $(GENERATED_ITEMS) DISTCLEANFILES = $(GENERATED_ITEMS)