sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

Fixed 'make dist'

Browse source 
* clutter/cogl/Makefile.am (EXTRA_DIST): Distribute cogl.h.in
	instead of cogl.h
	(DIST_SUBDIRS): Added common folder

	* clutter/cogl/gl/Makefile.am (libclutter_cogl_la_SOURCES): Remove
	cogl-defines.h and use the right location for cogl-defines.gl.h
	(EXTRA_DIST): Distribute cogl-defines.h.in

	* clutter/cogl/gles/Makefile.am (libclutter_cogl_la_SOURCES):
	Remove cogl-defines.h and use the right location for
	cogl-defines.gles.h
	(EXTRA_DIST): Distribute cogl-defines.h.in

	* clutter/Makefile.am (DIST_SUBDIRS): Add fruity
This commit is contained in:
Neil Roberts 2008-04-28 16:57:44 +00:00
parent 18826f3b04
commit 122e1dafd1
5 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
ChangeLog
View file

@ -1,3 +1,22 @@
2008-04-28 Neil Roberts <neil@o-hand.com>
Fixed 'make dist'
* clutter/cogl/Makefile.am (EXTRA_DIST): Distribute cogl.h.in
instead of cogl.h
(DIST_SUBDIRS): Added common folder
* clutter/cogl/gl/Makefile.am (libclutter_cogl_la_SOURCES): Remove
cogl-defines.h and use the right location for cogl-defines.gl.h
(EXTRA_DIST): Distribute cogl-defines.h.in
* clutter/cogl/gles/Makefile.am (libclutter_cogl_la_SOURCES):
Remove cogl-defines.h and use the right location for
cogl-defines.gles.h
(EXTRA_DIST): Distribute cogl-defines.h.in
* clutter/Makefile.am (DIST_SUBDIRS): Add fruity
2008-04-28 Neil Roberts <neil@o-hand.com> 2008-04-28 Neil Roberts <neil@o-hand.com>
* clutter/cogl/cogl.h.in (COGL_A_BIT): Added the missing comma * clutter/cogl/cogl.h.in (COGL_A_BIT): Added the missing comma

2
clutter/Makefile.am
View file

@ -9,7 +9,7 @@ clutter_json_dep = json/libclutter-json.la
clutter_json_libadd = $(top_builddir)/clutter/json/libclutter-json.la clutter_json_libadd = $(top_builddir)/clutter/json/libclutter-json.la
endif endif
DIST_SUBDIRS = pango glx eglx eglnative cogl sdl json osx x11 win32 DIST_SUBDIRS = pango glx eglx eglnative cogl sdl json osx x11 win32 fruity
target = $(clutterbackend) target = $(clutterbackend)

4
clutter/cogl/Makefile.am
View file

@ -1,5 +1,5 @@
SUBDIRS = common $(CLUTTER_COGL) SUBDIRS = common $(CLUTTER_COGL)
EXTRA_DIST = cogl.h EXTRA_DIST = cogl.h.in
DIST_SUBDIRS = gl gles DIST_SUBDIRS = common gl gles

5
clutter/cogl/gl/Makefile.am
View file

@ -20,8 +20,7 @@ noinst_LTLIBRARIES = libclutter-cogl.la
libclutter_cogl_la_SOURCES = \ libclutter_cogl_la_SOURCES = \
$(top_builddir)/clutter/cogl/cogl.h \ $(top_builddir)/clutter/cogl/cogl.h \
$(top_builddir)/clutter/cogl/gl/cogl-defines.h \ $(top_builddir)/clutter/cogl/cogl-defines-gl.h \
cogl-defines.h \
cogl-internal.h \ cogl-internal.h \
cogl-primitives.h \ cogl-primitives.h \
cogl-texture.h \ cogl-texture.h \
@ -33,4 +32,6 @@ libclutter_cogl_la_SOURCES = \
cogl-fbo.c \ cogl-fbo.c \
cogl-context.c cogl-context.c
EXTRA_DIST = cogl-defines.h.in
libclutter_cogl_la_LIBADD = $(top_builddir)/clutter/cogl/common/libclutter-cogl-common.la libclutter_cogl_la_LIBADD = $(top_builddir)/clutter/cogl/common/libclutter-cogl-common.la

5
clutter/cogl/gles/Makefile.am
View file

@ -20,8 +20,7 @@ noinst_LTLIBRARIES = libclutter-cogl.la
libclutter_cogl_la_SOURCES = \ libclutter_cogl_la_SOURCES = \
$(top_builddir)/clutter/cogl/cogl.h \ $(top_builddir)/clutter/cogl/cogl.h \
$(top_builddir)/clutter/cogl/gles/cogl-defines.h \ $(top_builddir)/clutter/cogl/cogl-defines-gles.h \
cogl-defines.h \
cogl-internal.h \ cogl-internal.h \
cogl-primitives.h \ cogl-primitives.h \
cogl-texture.h \ cogl-texture.h \
@ -33,4 +32,6 @@ libclutter_cogl_la_SOURCES = \
cogl-fbo.c \ cogl-fbo.c \
cogl-context.c cogl-context.c
EXTRA_DIST = cogl-defines.h.in
libclutter_cogl_la_LIBADD = $(top_builddir)/clutter/cogl/common/libclutter-cogl-common.la libclutter_cogl_la_LIBADD = $(top_builddir)/clutter/cogl/common/libclutter-cogl-common.la