[cogl/msvc-support] Update cogl/Makefile.am



commit 7fb75e2c32c1a4d1cf4b10cf34ca38a6fdec78f9
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon Aug 1 11:51:22 2011 +0800

    Update cogl/Makefile.am
    
    The cogl/cogl-display.h.in needs to be distributed as well...
    
    Also stop the distribution of the "generated" cogl/cogl-display.h

 cogl/Makefile.am |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/cogl/Makefile.am b/cogl/Makefile.am
index a93f55c..a1f84c5 100644
--- a/cogl/Makefile.am
+++ b/cogl/Makefile.am
@@ -35,9 +35,9 @@ AM_CPPFLAGS = \
 
 AM_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS)
 
-BUILT_SOURCES += cogl-defines.h
-DISTCLEANFILES += cogl-defines.h
-EXTRA_DIST += cogl-defines.h.in
+BUILT_SOURCES += cogl-defines.h cogl-display.h
+DISTCLEANFILES += cogl-defines.h cogl-display.h
+EXTRA_DIST += cogl-defines.h.in cogl-display.h.in
 
 # Note: The cogl-1.0/cogl-gl-1.0 files are essentially for
 # compatability only.  I'm not really sure who could possibly be using
@@ -96,7 +96,6 @@ cogl_experimental_h = \
 	$(srcdir)/cogl-renderer.h 		\
 	$(srcdir)/cogl-swap-chain.h 		\
 	$(srcdir)/cogl-onscreen-template.h 	\
-	$(srcdir)/cogl-display.h 		\
 	$(srcdir)/cogl-context.h 		\
 	$(srcdir)/cogl2-path.h 			\
 	$(srcdir)/cogl2-clip-state.h		\
@@ -180,7 +179,6 @@ cogl_sources_c = \
 	$(srcdir)/cogl-onscreen-template.h 		\
 	$(srcdir)/cogl-onscreen-template.c 		\
 	$(srcdir)/cogl-display-private.h		\
-	$(srcdir)/cogl-display.h			\
 	$(srcdir)/cogl-display.c			\
 	$(srcdir)/cogl-internal.h			\
 	$(srcdir)/cogl.c				\
@@ -387,7 +385,7 @@ cogl_headers = \
 
 coglincludedir = $(includedir)/cogl/cogl
 coglinclude_HEADERS = $(cogl_headers) $(cogl_experimental_h)
-nodist_coglinclude_HEADERS = cogl-defines.h cogl-enum-types.h
+nodist_coglinclude_HEADERS = cogl-defines.h cogl-enum-types.h cogl-display.h
 
 dist-hook: ../build/win32/vs9/cogl.vcproj ../build/win32/vs10/cogl.vcxproj ../build/win32/vs10/cogl.vcxproj.filters
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]