diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2011-12-15 20:31:04 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2011-12-15 20:31:31 +0800 |
| commit | 330146557db28968ee3ebc4527ea816ff38c01be (patch) | |
| tree | 296a4a1e28aba714918e67dac9240f04aa5a66e0 | |
| parent | 0e99461f6e52da6b642362fad1a2244295e18f25 (diff) | |
| download | cogl-330146557db28968ee3ebc4527ea816ff38c01be.tar.gz | |
Bug 664827: Autotools changes for Windows .rc files
This will make autotools fill in the versioning info for the COGL/
COGL-Pango .rc files and distribute the resulting .rc files
| -rw-r--r-- | cogl-pango/Makefile.am | 4 | ||||
| -rw-r--r-- | cogl/Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/cogl-pango/Makefile.am b/cogl-pango/Makefile.am index d8cf3737..04bab90b 100644 --- a/cogl-pango/Makefile.am +++ b/cogl-pango/Makefile.am @@ -89,9 +89,9 @@ dist-hook: ../build/win32/vs9/cogl-pango.vcproj ../build/win32/vs10/cogl-pango.v $(CPP) -P - <$(top_srcdir)/build/win32/vs10/cogl-pango.vcxproj.filtersin >$@ rm coglpango.vs10.sourcefiles.filters -EXTRA_DIST += cogl-pango.symbols +EXTRA_DIST += cogl-pango.symbols cogl-pango.rc.in cogl-pango.rc -DISTCLEANFILES += ../build/win32/vs9/cogl-pango.vcproj ../build/win32/vs10/cogl-pango.vcxproj ../build/win32/vs10/cogl-pango.vcxproj.filters +DISTCLEANFILES += ../build/win32/vs9/cogl-pango.vcproj ../build/win32/vs10/cogl-pango.vcxproj ../build/win32/vs10/cogl-pango.vcxproj.filters cogl-pango.rc -include $(INTROSPECTION_MAKEFILE) diff --git a/cogl/Makefile.am b/cogl/Makefile.am index c25647e0..668a5137 100644 --- a/cogl/Makefile.am +++ b/cogl/Makefile.am @@ -529,9 +529,11 @@ cogl.vsenums_c: EXTRA_DIST += \ cogl-defines.h.win32 \ - cogl.symbols + cogl.symbols \ + cogl.rc.in \ + cogl.rc -DISTCLEANFILES += ../build/win32/vs9/cogl.vcproj ../build/win32/vs10/cogl.vcxproj ../build/win32/vs10/cogl.vcxproj.filters ../build/win32/gen-enums.bat +DISTCLEANFILES += ../build/win32/vs9/cogl.vcproj ../build/win32/vs10/cogl.vcxproj ../build/win32/vs10/cogl.vcxproj.filters ../build/win32/gen-enums.bat cogl.rc -include $(INTROSPECTION_MAKEFILE) diff --git a/configure.ac b/configure.ac index d05c9d0a..f1b2dbdf 100644 --- a/configure.ac +++ b/configure.ac @@ -1071,9 +1071,11 @@ cogl/Makefile cogl/cogl-1.0.pc cogl/cogl-2.0-experimental.pc cogl/cogl-defines.h +cogl/cogl.rc cogl-pango/Makefile cogl-pango/cogl-pango-1.0.pc cogl-pango/cogl-pango-2.0-experimental.pc +cogl-pango/cogl-pango.rc doc/Makefile doc/reference/Makefile doc/reference/cogl/Makefile |