2008-05-19 Emmanuele Bassi <ebassi@openedhand.com>

* clutter/eglx/Makefile.am: Fix the INCLUDE directives to
	properly include the X11 backend headers.

	* clutter/glx/Makefile.am: Add the libclutter-x11.la static
	library to the LDADD directives.
This commit is contained in:
Emmanuele Bassi 2008-05-19 14:21:24 +00:00
parent 460b05bd83
commit aec03912b8
3 changed files with 13 additions and 3 deletions

View File

@ -1,3 +1,11 @@
2008-05-19 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/eglx/Makefile.am: Fix the INCLUDE directives to
properly include the X11 backend headers.
* clutter/glx/Makefile.am: Add the libclutter-x11.la static
library to the LDADD directives.
2008-05-19 Tomas Frydrych <tf@openedhand.com> 2008-05-19 Tomas Frydrych <tf@openedhand.com>
* clutter/x11/clutter-x11.h: * clutter/x11/clutter-x11.h:

View File

@ -4,12 +4,14 @@ libclutterinclude_HEADERS = clutter-eglx.h
INCLUDES = \ INCLUDES = \
-DG_LOG_DOMAIN=\"ClutterEGL\" \ -DG_LOG_DOMAIN=\"ClutterEGL\" \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/clutter \
-I$(top_srcdir)/clutter/x11 \
-I$(top_builddir)/clutter \
$(CLUTTER_CFLAGS) \ $(CLUTTER_CFLAGS) \
$(CLUTTER_DEBUG_CFLAGS) \ $(CLUTTER_DEBUG_CFLAGS) \
$(GCC_FLAGS) $(GCC_FLAGS)
LDADD = $(CLUTTER_LIBS) \ LDADD = $(CLUTTER_LIBS) $(top_builddir)/clutter/x11/libclutter-x11.la
$(top_srcdir)/clutter/x11/libclutter-x11.la
noinst_LTLIBRARIES = libclutter-eglx.la noinst_LTLIBRARIES = libclutter-eglx.la

View File

@ -11,7 +11,7 @@ INCLUDES = \
$(CLUTTER_DEBUG_CFLAGS) \ $(CLUTTER_DEBUG_CFLAGS) \
$(GCC_FLAGS) $(GCC_FLAGS)
LDADD = $(CLUTTER_LIBS) LDADD = $(CLUTTER_LIBS) $(top_builddir)/clutter/x11/libclutter-x11.la
noinst_LTLIBRARIES = libclutter-glx.la noinst_LTLIBRARIES = libclutter-glx.la