From dfc32b60c4b1b0b83fbf70d7e02b58cbc919326a Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 11 Aug 2009 13:11:34 +0100 Subject: [PATCH] [osx] Clean up Makefile.am The OS X backend Makefile.am was missing a line concatenation, and so the -xobjective-c directive was always ignored. Instead of dumping everything into INCLUDES and LDADD we should follow what the rest of the backends do, and use per-target CFLAGS and LDADD, and reserve the INCLUDES to -D and -I directives. Thanks to: Christian Hergert --- clutter/osx/Makefile.am | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/clutter/osx/Makefile.am b/clutter/osx/Makefile.am index 82d282d38..ad25357c9 100644 --- a/clutter/osx/Makefile.am +++ b/clutter/osx/Makefile.am @@ -2,24 +2,22 @@ libclutterincludedir = $(includedir)/clutter-@CLUTTER_API_VERSION@/clutter libclutterinclude_HEADERS = clutter-osx.h INCLUDES = \ - -DG_LOG_DOMAIN=\"ClutterOSX\" \ - -DCLUTTER_COMPILATION \ - -I$(top_srcdir) \ - -I$(top_srcdir)/clutter \ - -I$(top_builddir)/clutter \ - $(CLUTTER_CFLAGS) \ - $(CLUTTER_DEBUG_CFLAGS) \ - $(MAINTAINER_CFLAGS) - -xobjective-c + -DG_LOG_DOMAIN=\"ClutterOSX\" \ + -DCLUTTER_COMPILATION \ + -I$(top_srcdir) \ + -I$(top_srcdir)/clutter \ + -I$(top_builddir)/clutter -LDADD = $(CLUTTER_LIBS) +common_ldadd = $(CLUTTER_LIBS) noinst_LTLIBRARIES = libclutter-osx.la -libclutter_osx_la_SOURCES = \ - clutter-backend-osx.h \ - clutter-backend-osx.c \ - clutter-event-osx.c \ - clutter-stage-osx.h \ - clutter-stage-osx.c \ +libclutter_osx_la_CFLAGS = $(CLUTTER_CFLAGS) $(CLUTTER_DEBUG_CFLAGS) $(MAINTAINER_CFLAGS) -xobjective-c +libclutter_osx_la_LDADD = $(common_ldadd) +libclutter_osx_la_SOURCES = \ + clutter-backend-osx.h \ + clutter-backend-osx.c \ + clutter-event-osx.c \ + clutter-stage-osx.h \ + clutter-stage-osx.c \ clutter-osx.h