mirror of
https://github.com/brl/mutter.git
synced 2024-12-26 21:02:14 +00:00
build: Distcheck fixes after the Cally merge
This commit is contained in:
parent
e3a8ece54d
commit
f87e4037a8
@ -54,7 +54,9 @@ INCLUDES = \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_srcdir)/clutter \
|
||||
-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 = \
|
||||
-DG_LOG_DOMAIN=\"Cally\" \
|
||||
|
@ -48,8 +48,8 @@ FIXXREF_OPTIONS=\
|
||||
# Used for dependencies. The docs will be rebuilt if any of these change.
|
||||
# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
|
||||
# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
|
||||
HFILE_GLOB=$(top_srcdir)/clutter/cally/*.h $(top_builddir)/clutter/cally/*.h
|
||||
CFILE_GLOB=$(top_srcdir)/clutter/cally/*.c $(top_builddir)/clutter/cally/*.c
|
||||
HFILE_GLOB=$(top_srcdir)/clutter/cally/*.h
|
||||
CFILE_GLOB=$(top_srcdir)/clutter/cally/*.c
|
||||
|
||||
# Header files to ignore when scanning.
|
||||
# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
|
||||
|
@ -4,7 +4,7 @@ if BUILD_TESTS
|
||||
SUBDIRS += conform
|
||||
endif
|
||||
|
||||
DIST_SUBDIRS = data conform interactive micro-bench tools
|
||||
DIST_SUBDIRS = accessibility data conform interactive micro-bench tools
|
||||
|
||||
EXTRA_DIST = README
|
||||
|
||||
|
@ -8,7 +8,7 @@ EXAMPLES = cally-atkcomponent-example \
|
||||
|
||||
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 = \
|
||||
-I$(top_srcdir) \
|
||||
@ -20,13 +20,15 @@ INCLUDES = \
|
||||
|
||||
noinst_PROGRAMS = $(EXAMPLES)
|
||||
|
||||
EXTRA_DIST = $(common_sources)
|
||||
|
||||
# atk component example
|
||||
cally_atkcomponent_example_LDADD = $(CLUTTER_LIBS) $(common_ldadd)
|
||||
cally_atkcomponent_example_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS) \
|
||||
-DPREFIXDIR=\"$(libdir)\" \
|
||||
$(INCLUDES)
|
||||
cally_atkcomponent_example_SOURCES = cally-atkcomponent-example.c \
|
||||
$(CALLY_UTIL_SOURCES)
|
||||
$(common_sources)
|
||||
|
||||
# atk text example
|
||||
cally_atktext_example_LDADD = $(CLUTTER_LIBS) $(common_ldadd)
|
||||
@ -34,7 +36,7 @@ cally_atktext_example_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)\
|
||||
-DPREFIXDIR=\"$(libdir)\" \
|
||||
$(INCLUDES)
|
||||
cally_atktext_example_SOURCES = cally-atktext-example.c \
|
||||
$(CALLY_UTIL_SOURCES)
|
||||
$(common_sources)
|
||||
|
||||
# atk text example2
|
||||
cally_atkevents_example_LDADD = $(CLUTTER_LIBS) $(common_ldadd)
|
||||
@ -42,7 +44,7 @@ cally_atkevents_example_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)\
|
||||
-DPREFIXDIR=\"$(libdir)\" \
|
||||
$(INCLUDES)
|
||||
cally_atkevents_example_SOURCES = cally-atkevents-example.c \
|
||||
$(CALLY_UTIL_SOURCES)
|
||||
$(common_sources)
|
||||
|
||||
# atk editable text example
|
||||
cally_atkeditabletext_example_LDADD = $(CLUTTER_LIBS) $(common_ldadd)
|
||||
@ -50,7 +52,7 @@ cally_atkeditabletext_example_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS) \
|
||||
-DPREFIXDIR=\"$(libdir)\" \
|
||||
$(INCLUDES)
|
||||
cally_atkeditabletext_example_SOURCES = cally-atkeditabletext-example.c \
|
||||
$(CALLY_UTIL_SOURCES)
|
||||
$(common_sources)
|
||||
|
||||
# cally clone example
|
||||
cally_clone_example_LDADD = $(CLUTTER_LIBS) $(common_ldadd)
|
||||
@ -58,4 +60,4 @@ cally_clone_example_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS) \
|
||||
-DPREFIXDIR=\"$(libdir)\" \
|
||||
$(INCLUDES)
|
||||
cally_clone_example_SOURCES = cally-clone-example.c \
|
||||
$(CALLY_UTIL_SOURCES)
|
||||
$(common_sources)
|
||||
|
Loading…
Reference in New Issue
Block a user