diff options
| author | Brian Tarricone <brian@tarricone.org> | 2008-10-17 08:40:22 +0000 |
|---|---|---|
| committer | Brian Tarricone <brian@tarricone.org> | 2008-10-17 08:40:22 +0000 |
| commit | 27711adba14177f30aa410c90e0429a0a598721c (patch) | |
| tree | a5f4a671d9cf570d4220f050669285935e992cb7 /libxfsm | |
| parent | 4e0f0c45c76dc817d36e762f56167cde8840d38b (diff) | |
| download | xfce4-session-27711adba14177f30aa410c90e0429a0a598721c.tar.gz | |
* xfce4-session/ice-layer.c: Properly initialise a GError to
NULL. Patch from Carlos Santos (bug 4202).
* libxfsm/Makefile.am: Link all used libraries to libxfsm.so
to avoid link-time errors on Darwin. Shouldn't be an issue
on other platforms as well. Partial patch from Anders
Björklund (bug 4429).
(Old svn revision: 28275)
Diffstat (limited to 'libxfsm')
| -rw-r--r-- | libxfsm/Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libxfsm/Makefile.am b/libxfsm/Makefile.am index 1883cc5a..bf877f4a 100644 --- a/libxfsm/Makefile.am +++ b/libxfsm/Makefile.am @@ -17,18 +17,18 @@ libxfsm_4_6_la_CFLAGS = \ libxfsm_4_6_la_LDFLAGS = \ -export-dynamic \ - -version-info 0:0:0 + -version-info 0:0:0 \ + $(LIBX11_LDFLAGS) if HAVE_OS_CYGWIN libxfsm_4_6_la_LDFLAGS += \ - -no-undefined \ - $(LIBX11_LDFLAGS@ + -no-undefined +endif libxfsm_4_6_la_LIBADD = \ $(LIBX11_LIBS) \ $(LIBXFCEGUI4_LIBS) \ $(XFCONF_LIBS) -endif libxfsmincludedir = \ |