brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Distcheck fixes after the Cally merge

Browse Source
This commit is contained in:
Emmanuele Bassi 2010-07-07 16:30:31 +01:00
parent e3a8ece54d
commit f87e4037a8
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clutter/cally/Makefile.am
View File

@ -54,7 +54,9 @@ INCLUDES = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/clutter \ -I$(top_srcdir)/clutter \
-I$(top_srcdir)/clutter/cally \ -I$(top_srcdir)/clutter/cally \
-I$(top_srcdir)/clutter/cogl -I$(top_srcdir)/clutter/cogl \
-I$(top_builddir)/clutter \
-I$(top_builddir)/clutter/cogl
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Cally\" \ -DG_LOG_DOMAIN=\"Cally\" \

4
doc/reference/cally/Makefile.am
View File

@ -48,8 +48,8 @@ FIXXREF_OPTIONS=\
# Used for dependencies. The docs will be rebuilt if any of these change. # Used for dependencies. The docs will be rebuilt if any of these change.
# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
HFILE_GLOB=$(top_srcdir)/clutter/cally/*.h $(top_builddir)/clutter/cally/*.h HFILE_GLOB=$(top_srcdir)/clutter/cally/*.h
CFILE_GLOB=$(top_srcdir)/clutter/cally/*.c $(top_builddir)/clutter/cally/*.c CFILE_GLOB=$(top_srcdir)/clutter/cally/*.c
# Header files to ignore when scanning. # Header files to ignore when scanning.
# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h

2
tests/Makefile.am
View File

@ -4,7 +4,7 @@ if BUILD_TESTS
SUBDIRS += conform SUBDIRS += conform
endif endif
DIST_SUBDIRS = data conform interactive micro-bench tools DIST_SUBDIRS = accessibility data conform interactive micro-bench tools
EXTRA_DIST = README EXTRA_DIST = README

14
tests/accessibility/Makefile.am
View File

@ -8,7 +8,7 @@ EXAMPLES = cally-atkcomponent-example \
common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_WINSYS@-@CLUTTER_API_VERSION@.la common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_WINSYS@-@CLUTTER_API_VERSION@.la
CALLY_UTIL_SOURCES = cally-examples-util.c common_sources = cally-examples-util.c cally-examples-util.h
INCLUDES = \ INCLUDES = \
-I$(top_srcdir) \ -I$(top_srcdir) \
@ -20,13 +20,15 @@ INCLUDES = \
noinst_PROGRAMS = $(EXAMPLES) noinst_PROGRAMS = $(EXAMPLES)
EXTRA_DIST = $(common_sources)
# atk component example # atk component example
cally_atkcomponent_example_LDADD = $(CLUTTER_LIBS) $(common_ldadd) cally_atkcomponent_example_LDADD = $(CLUTTER_LIBS) $(common_ldadd)
cally_atkcomponent_example_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS) \ cally_atkcomponent_example_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS) \
-DPREFIXDIR=\"$(libdir)\" \ -DPREFIXDIR=\"$(libdir)\" \
$(INCLUDES) $(INCLUDES)
cally_atkcomponent_example_SOURCES = cally-atkcomponent-example.c \ cally_atkcomponent_example_SOURCES = cally-atkcomponent-example.c \
$(CALLY_UTIL_SOURCES) $(common_sources)
# atk text example # atk text example
cally_atktext_example_LDADD = $(CLUTTER_LIBS) $(common_ldadd) cally_atktext_example_LDADD = $(CLUTTER_LIBS) $(common_ldadd)
@ -34,7 +36,7 @@ cally_atktext_example_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)\
-DPREFIXDIR=\"$(libdir)\" \ -DPREFIXDIR=\"$(libdir)\" \
$(INCLUDES) $(INCLUDES)
cally_atktext_example_SOURCES = cally-atktext-example.c \ cally_atktext_example_SOURCES = cally-atktext-example.c \
$(CALLY_UTIL_SOURCES) $(common_sources)
# atk text example2 # atk text example2
cally_atkevents_example_LDADD = $(CLUTTER_LIBS) $(common_ldadd) cally_atkevents_example_LDADD = $(CLUTTER_LIBS) $(common_ldadd)
@ -42,7 +44,7 @@ cally_atkevents_example_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)\
-DPREFIXDIR=\"$(libdir)\" \ -DPREFIXDIR=\"$(libdir)\" \
$(INCLUDES) $(INCLUDES)
cally_atkevents_example_SOURCES = cally-atkevents-example.c \ cally_atkevents_example_SOURCES = cally-atkevents-example.c \
$(CALLY_UTIL_SOURCES) $(common_sources)
# atk editable text example # atk editable text example
cally_atkeditabletext_example_LDADD = $(CLUTTER_LIBS) $(common_ldadd) cally_atkeditabletext_example_LDADD = $(CLUTTER_LIBS) $(common_ldadd)
@ -50,7 +52,7 @@ cally_atkeditabletext_example_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS) \
-DPREFIXDIR=\"$(libdir)\" \ -DPREFIXDIR=\"$(libdir)\" \
$(INCLUDES) $(INCLUDES)
cally_atkeditabletext_example_SOURCES = cally-atkeditabletext-example.c \ cally_atkeditabletext_example_SOURCES = cally-atkeditabletext-example.c \
$(CALLY_UTIL_SOURCES) $(common_sources)
# cally clone example # cally clone example
cally_clone_example_LDADD = $(CLUTTER_LIBS) $(common_ldadd) cally_clone_example_LDADD = $(CLUTTER_LIBS) $(common_ldadd)
@ -58,4 +60,4 @@ cally_clone_example_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS) \
-DPREFIXDIR=\"$(libdir)\" \ -DPREFIXDIR=\"$(libdir)\" \
$(INCLUDES) $(INCLUDES)
cally_clone_example_SOURCES = cally-clone-example.c \ cally_clone_example_SOURCES = cally-clone-example.c \
$(CALLY_UTIL_SOURCES) $(common_sources)