| Summary: | Modified files after build | ||
|---|---|---|---|
| Product: | cairo | Reporter: | Pascal Terjan <pterjan> |
| Component: | general | Assignee: | Carl Worth <cworth> |
| Status: | RESOLVED FIXED | QA Contact: | cairo-bugs mailing list <cairo-bugs> |
| Severity: | normal | ||
| Priority: | medium | ||
| Version: | 1.9.7 | ||
| Hardware: | Other | ||
| OS: | All | ||
| Whiteboard: | |||
| i915 platform: | i915 features: | ||
This should be fixed in cairo/master. |
Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.
After building (under Linux) git reports the following files to be modified boilerplate/Makefile.win32.features build/Makefile.win32.features-h src/Makefile.win32.features Which is annoying, for example, when doing a bisect diff --git a/boilerplate/Makefile.win32.features b/boilerplate/Makefile.win32.features index 4781d8a..31bd4e0 100644 --- a/boilerplate/Makefile.win32.features +++ b/boilerplate/Makefile.win32.features @@ -199,14 +199,6 @@ enabled_cairo_boilerplate_private += $(cairo_boilerplate_png_private) enabled_cairo_boilerplate_sources += $(cairo_boilerplate_png_sources) endif -supported_cairo_boilerplate_headers += $(cairo_boilerplate_glew_headers) -all_cairo_boilerplate_headers += $(cairo_boilerplate_glew_headers) -all_cairo_boilerplate_private += $(cairo_boilerplate_glew_private) -all_cairo_boilerplate_sources += $(cairo_boilerplate_glew_sources) -enabled_cairo_boilerplate_headers += $(cairo_boilerplate_glew_headers) -enabled_cairo_boilerplate_private += $(cairo_boilerplate_glew_private) -enabled_cairo_boilerplate_sources += $(cairo_boilerplate_glew_sources) - unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_gl_headers) all_cairo_boilerplate_headers += $(cairo_boilerplate_gl_headers) all_cairo_boilerplate_private += $(cairo_boilerplate_gl_private) diff --git a/build/Makefile.win32.features-h b/build/Makefile.win32.features-h index c2a5332..f7c07ac 100644 --- a/build/Makefile.win32.features-h +++ b/build/Makefile.win32.features-h @@ -59,7 +59,6 @@ endif ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1) @echo "#define CAIRO_HAS_PNG_FUNCTIONS 1" >> src/cairo-features.h endif - @echo "#define CAIRO_HAS_GLEW_FUNCTIONS 1" >> src/cairo-features.h ifeq ($(CAIRO_HAS_GL_SURFACE),1) @echo "#define CAIRO_HAS_GL_SURFACE 1" >> src/cairo-features.h endif diff --git a/src/Makefile.win32.features b/src/Makefile.win32.features index 05efd04..42fb696 100644 --- a/src/Makefile.win32.features +++ b/src/Makefile.win32.features @@ -273,14 +273,6 @@ ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1) enabled_cairo_pkgconf += cairo-png.pc endif -supported_cairo_headers += $(cairo_glew_headers) -all_cairo_headers += $(cairo_glew_headers) -all_cairo_private += $(cairo_glew_private) -all_cairo_sources += $(cairo_glew_sources) -enabled_cairo_headers += $(cairo_glew_headers) -enabled_cairo_private += $(cairo_glew_private) -enabled_cairo_sources += $(cairo_glew_sources) - unsupported_cairo_headers += $(cairo_gl_headers) all_cairo_headers += $(cairo_gl_headers) all_cairo_private += $(cairo_gl_private)