diff --git a/ChangeLog b/ChangeLog index 835954095..e79047abc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2008-04-09 Emmanuele Bassi + + * clutter/Makefile.am: Update the regular expression to match + all the namespaces we actually use. Thanks to Neil Roberts for + spotting this. A make distclean is needed. + + * clutter/cogl/gl/Makefile.am: + * clutter/cogl/gles/Makefile.am: + * clutter/json/Makefile.am: + * clutter/pango/Makefile.am: Revert previous commit. + 2008-04-09 Emmanuele Bassi * clutter/cogl/Makefile.am: diff --git a/clutter/Makefile.am b/clutter/Makefile.am index df0aadcd6..554e31211 100644 --- a/clutter/Makefile.am +++ b/clutter/Makefile.am @@ -32,7 +32,7 @@ INCLUDES = \ LDADD = \ $(CLUTTER_LT_LDFLAGS) \ -export-dynamic \ - -export-symbols-regex "^clutter.*" \ + -export-symbols-regex "^(clutter|cogl|json|pango).*" \ -rpath $(libdir) \ $(NULL) diff --git a/clutter/cogl/gl/Makefile.am b/clutter/cogl/gl/Makefile.am index aa260bfb5..98949b261 100644 --- a/clutter/cogl/gl/Makefile.am +++ b/clutter/cogl/gl/Makefile.am @@ -9,7 +9,7 @@ INCLUDES = \ $(CLUTTER_DEBUG_CFLAGS) \ $(GCC_FLAGS) -LDADD = $(CLUTTER_LIBS) -export-symbols-regex "^cogl.*" +LDADD = $(CLUTTER_LIBS) noinst_LTLIBRARIES = libclutter-cogl.la diff --git a/clutter/cogl/gles/Makefile.am b/clutter/cogl/gles/Makefile.am index 7540404bb..32dda4a67 100644 --- a/clutter/cogl/gles/Makefile.am +++ b/clutter/cogl/gles/Makefile.am @@ -9,7 +9,7 @@ INCLUDES = \ $(CLUTTER_DEBUG_CFLAGS) \ $(GCC_FLAGS) -LDADD = $(CLUTTER_LIBS) -export-symbols-regex "^cogl.*" +LDADD = $(CLUTTER_LIBS) noinst_LTLIBRARIES = libclutter-cogl.la diff --git a/clutter/json/Makefile.am b/clutter/json/Makefile.am index 2c06fd1de..7f3a7a0dc 100644 --- a/clutter/json/Makefile.am +++ b/clutter/json/Makefile.am @@ -24,7 +24,5 @@ INCLUDES = \ $(CLUTTER_CFLAGS) \ $(CLUTTER_DEBUG_CFLAGS) -LDADD = -export-symbols-regex "^json.*" - clutterjsondir = $(includedir)/clutter-@CLUTTER_MAJORMINOR@/clutter/json clutterjson_HEADERS = $(source_h) diff --git a/clutter/pango/Makefile.am b/clutter/pango/Makefile.am index 764d4fe11..bc3fc337d 100644 --- a/clutter/pango/Makefile.am +++ b/clutter/pango/Makefile.am @@ -19,7 +19,5 @@ INCLUDES = \ -I$(top_srcdir)/clutter/cogl \ -I$(top_srcdir)/clutter/cogl/@CLUTTER_COGL@ -LDADD = -export-symbols-regex "^pango.*" - pangoclutterheadersdir = $(includedir)/clutter-@CLUTTER_MAJORMINOR@/clutter pangoclutterheaders_HEADERS = $(source_h)