isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-23 08:30:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

[build] Clean up the eglnative and fruity Makefile.am

Browse Source 
* Do not use CLUTTER_MAJORMINOR

* Use per-target compiler flags and libraries
This commit is contained in:
Emmanuele Bassi 2009-08-14 13:08:17 +01:00
parent f7edc97d8d
commit 5274b4e4c4
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
clutter/eglnative/Makefile.am
View File

@ -1,4 +1,4 @@
libclutterincludedir = $(includedir)/clutter-@CLUTTER_MAJORMINOR@/clutter libclutterincludedir = $(includedir)/clutter-@CLUTTER_API_VERSION@/clutter
libclutterinclude_HEADERS = clutter-egl.h libclutterinclude_HEADERS = clutter-egl.h
INCLUDES = \ INCLUDES = \
@ -6,12 +6,9 @@ INCLUDES = \
-DCLUTTER_COMPILATION \ -DCLUTTER_COMPILATION \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/clutter \ -I$(top_srcdir)/clutter \
-I$(top_builddir)/clutter \ -I$(top_builddir)/clutter
$(CLUTTER_CFLAGS) \
$(CLUTTER_DEBUG_CFLAGS) \
$(MAINTAINER_CFLAGS)
LDADD = $(CLUTTER_LIBS) common_ldadd = $(CLUTTER_LIBS)
noinst_LTLIBRARIES = libclutter-eglnative.la noinst_LTLIBRARIES = libclutter-eglnative.la
@ -22,3 +19,5 @@ libclutter_eglnative_la_SOURCES = \
clutter-stage-egl.h \ clutter-stage-egl.h \
clutter-stage-egl.c \ clutter-stage-egl.c \
clutter-egl-headers.h clutter-egl-headers.h
libclutter_eglnative_la_CPPFLAGS = $(CLUTTER_CFLAGS) $(CLUTTER_DEBUG_CFLAGS) $(MAINTAINER_CFLAGS)
libclutter_eglnative_la_LIBADD = $(common_ldadd)

11
clutter/fruity/Makefile.am
View File

@ -1,19 +1,18 @@
libclutterincludedir = $(includedir)/clutter-@CLUTTER_MAJORMINOR@/clutter libclutterincludedir = $(includedir)/clutter-@CLUTTER_API_VERSION@/clutter
INCLUDES = \ INCLUDES = \
-DG_LOG_DOMAIN=\"ClutterFruity\" \ -DG_LOG_DOMAIN=\"ClutterFruity\" \
-DCLUTTER_COMPILATION \ -DCLUTTER_COMPILATION \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/clutter \ -I$(top_srcdir)/clutter \
$(CLUTTER_CFLAGS) \ -I$(top_builddir)/clutter
$(CLUTTER_DEBUG_CFLAGS) \
$(MAINTAINER_CFLAGS) \
-xobjective-c
LDADD = $(CLUTTER_LIBS) common_ldadd = $(CLUTTER_LIBS)
noinst_LTLIBRARIES = libclutter-fruity.la noinst_LTLIBRARIES = libclutter-fruity.la
libclutter_fruity_la_CFLAGS = $(CLUTTER_CFLAGS) $(CLUTTER_DEBUG_CFLAGS) $(MAINTAINER_CFLAGS) -xobjective-c
libclutter_fruity_la_LIBADD = $(common_ldadd)
libclutter_fruity_la_SOURCES = \ libclutter_fruity_la_SOURCES = \
clutter-backend-fruity.h \ clutter-backend-fruity.h \
clutter-backend-fruity.c \ clutter-backend-fruity.c \