summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorquinn <quinn@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2007-01-06 15:48:00 +0000
committerquinn <quinn@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2007-01-06 15:48:00 +0000
commite7aa8bd758cbb4c7eee4565ace5beba79537629f (patch)
tree1abaf6234ebe6b3818841cb41a0aca5bd6a354a6
parent81f881877597f3205e44cf02f08f12f791f730b5 (diff)
downloadmarex-dev-e7aa8bd758cbb4c7eee4565ace5beba79537629f.tar.gz
marex-dev-e7aa8bd758cbb4c7eee4565ace5beba79537629f.tar.bz2
revert 2407 and 2408 since they were causing problems with python bindings
eventually we'll have to look into this, but its low priority since everything that dlopen()'s the plugins already links libberylsettings git-svn-id: file:///beryl/trunk@2419 d7aaf104-2d23-0410-ae22-9d23157bf5a3
-rw-r--r--beryl-dbus/configure.ac1
-rw-r--r--beryl-dbus/src/Makefile.am2
-rw-r--r--beryl-plugins/configure.ac1
-rw-r--r--beryl-plugins/src/Makefile.am66
4 files changed, 36 insertions, 34 deletions
diff --git a/beryl-dbus/configure.ac b/beryl-dbus/configure.ac
index f014f2a..c1c0124 100644
--- a/beryl-dbus/configure.ac
+++ b/beryl-dbus/configure.ac
@@ -88,6 +88,7 @@ AC_MSG_NOTICE([Using PKG_CONFIG_PATH=$PKG_CONFIG_PATH])
PKG_CHECK_MODULES(BERYL, beryl)
+PKG_CHECK_MODULES(BERYLSETTINGS, berylsettings)
PKG_CHECK_MODULES(DBUS, dbus-1)
diff --git a/beryl-dbus/src/Makefile.am b/beryl-dbus/src/Makefile.am
index a2c28bb..a6314dc 100644
--- a/beryl-dbus/src/Makefile.am
+++ b/beryl-dbus/src/Makefile.am
@@ -2,7 +2,7 @@
PFLAGS=-module -avoid-version -no-undefined
libdbus_la_LDFLAGS = $(PFLAGS)
-libdbus_la_LIBADD = @BERYL_LIBS@ @DBUS_LIBS@
+libdbus_la_LIBADD = @BERYL_LIBS@ @DBUS_LIBS@ @BERYLSETTINGS_LIBS@
libdbus_la_SOURCES = dbus.c
INCLUDES = \
diff --git a/beryl-plugins/configure.ac b/beryl-plugins/configure.ac
index 247384f..0c24bb4 100644
--- a/beryl-plugins/configure.ac
+++ b/beryl-plugins/configure.ac
@@ -92,6 +92,7 @@ AC_SUBST(PKG_CONFIG_PATH)
AC_MSG_NOTICE([Using PKG_CONFIG_PATH=$PKG_CONFIG_PATH])
PKG_CHECK_MODULES(BERYL, beryl)
+PKG_CHECK_MODULES(BERYLSETTINGS, berylsettings)
AC_MSG_CHECKING(for GL_CFLAGS)
AC_ARG_WITH(gl-cflags, [ --with-gl-cflags=CFLAGS ],
diff --git a/beryl-plugins/src/Makefile.am b/beryl-plugins/src/Makefile.am
index 38d905d..345b7d2 100644
--- a/beryl-plugins/src/Makefile.am
+++ b/beryl-plugins/src/Makefile.am
@@ -2,141 +2,141 @@
PFLAGS=-module -avoid-version -no-undefined
libclone_la_LDFLAGS = $(PFLAGS)
-libclone_la_LIBADD = @BERYL_LIBS@
+libclone_la_LIBADD = @BERYL_LIBS@ @BERYLSETTINGS_LIBS@
libclone_la_SOURCES = clone.c
libgroup_la_LDFLAGS = $(PFLAGS)
-libgroup_la_LIBADD = @BERYL_LIBS@
+libgroup_la_LIBADD = @BERYL_LIBS@ @BERYLSETTINGS_LIBS@
libgroup_la_SOURCES = group.c
libpng_la_LDFLAGS = $(PFLAGS)
-libpng_la_LIBADD = @BERYL_LIBS@
+libpng_la_LIBADD = @BERYL_LIBS@ @BERYLSETTINGS_LIBS@
libpng_la_SOURCES = png.c
libsvg_la_LDFLAGS = $(PFLAGS)
-libsvg_la_LIBADD = @BERYL_LIBS@ @LIBRSVG_LIBS@
+libsvg_la_LIBADD = @BERYL_LIBS@ @BERYLSETTINGS_LIBS@ @LIBRSVG_LIBS@
libsvg_la_SOURCES = svg.c
if ANNOTATE_PLUGIN
libannotate_la_LDFLAGS = $(PFLAGS)
-libannotate_la_LIBADD = @BERYL_LIBS@ @LIBRSVG_LIBS@ @ANNOTATE_LIBS@
+libannotate_la_LIBADD = @BERYL_LIBS@ @LIBRSVG_LIBS@ @ANNOTATE_LIBS@ @BERYLSETTINGS_LIBS@
libannotate_la_SOURCES = annotate.c
libannotate_module = libannotate.la
endif
libsplash_la_LDFLAGS = $(PFLAGS)
-libsplash_la_LIBADD = @BERYL_LIBS@
+libsplash_la_LIBADD = @BERYL_LIBS@ @BERYLSETTINGS_LIBS@
libsplash_la_SOURCES = splash.c
libblurfx_la_LDFLAGS = $(PFLAGS)
-libblurfx_la_LIBADD = @BERYL_LIBS@
+libblurfx_la_LIBADD = @BERYL_LIBS@ @BERYLSETTINGS_LIBS@
libblurfx_la_SOURCES = blurfx.c blurfx.h blurfx_shader.h
libplane_la_LDFLAGS = $(PFLAGS)
-libplane_la_LIBADD = @BERYL_LIBS@
+libplane_la_LIBADD = @BERYL_LIBS@ @BERYLSETTINGS_LIBS@
libplane_la_SOURCES = plane.c
libcrashhandler_la_LDFLAGS = $(PFLAGS)
-libcrashhandler_la_LIBADD = @BERYL_LIBS@
+libcrashhandler_la_LIBADD = @BERYL_LIBS@ @BERYLSETTINGS_LIBS@
libcrashhandler_la_SOURCES = crashhandler.c
libbench_la_LDFLAGS = $(PFLAGS)
-libbench_la_LIBADD = @BERYL_LIBS@
+libbench_la_LIBADD = @BERYL_LIBS@ @BERYLSETTINGS_LIBS@
libbench_la_SOURCES = bench.c bench_tex.h
libscreenshot_la_LDFLAGS = $(PFLAGS)
-libscreenshot_la_LIBADD = @BERYL_LIBS@
+libscreenshot_la_LIBADD = @BERYL_LIBS@ @BERYLSETTINGS_LIBS@
libscreenshot_la_SOURCES = screenshot.c
libput_la_LDFLAGS = $(PFLAGS)
-libput_la_LIBADD = @BERYL_LIBS@
+libput_la_LIBADD = @BERYL_LIBS@ @BERYLSETTINGS_LIBS@
libput_la_SOURCES = put.c
libshowdesktop_la_LDFLAGS = $(PFLAGS)
-libshowdesktop_la_LIBADD = @BERYL_LIBS@
+libshowdesktop_la_LIBADD = @BERYL_LIBS@ @BERYLSETTINGS_LIBS@
libshowdesktop_la_SOURCES = showdesktop.c
libtrailfocus_la_LDFLAGS = $(PFLAGS)
-libtrailfocus_la_LIBADD = @BERYL_LIBS@
+libtrailfocus_la_LIBADD = @BERYL_LIBS@ @BERYLSETTINGS_LIBS@
libtrailfocus_la_SOURCES = trailfocus.c
libfade_la_LDFLAGS = $(PFLAGS)
-libfade_la_LIBADD = @BERYL_LIBS@
+libfade_la_LIBADD = @BERYL_LIBS@ @BERYLSETTINGS_LIBS@
libfade_la_SOURCES = fade.c
libcube_la_LDFLAGS = $(PFLAGS)
-libcube_la_LIBADD = @BERYL_LIBS@ @LIBRSVG_LIBS@
+libcube_la_LIBADD = @BERYL_LIBS@ @LIBRSVG_LIBS@ @BERYLSETTINGS_LIBS@
libcube_la_SOURCES = cube.c
librotate_la_LDFLAGS = $(PFLAGS)
-librotate_la_LIBADD = @BERYL_LIBS@
+librotate_la_LIBADD = @BERYL_LIBS@ @BERYLSETTINGS_LIBS@
librotate_la_SOURCES = rotate.c
libzoom_la_LDFLAGS = $(PFLAGS)
-libzoom_la_LIBADD = @BERYL_LIBS@
+libzoom_la_LIBADD = @BERYL_LIBS@ @BERYLSETTINGS_LIBS@
libzoom_la_SOURCES = zoom.c
libinputzoom_la_LDFLAGS = $(PFLAGS)
-libinputzoom_la_LIBADD = @BERYL_LIBS@
+libinputzoom_la_LIBADD = @BERYL_LIBS@ @BERYLSETTINGS_LIBS@
libinputzoom_la_SOURCES = inputzoom.c
libscale_la_LDFLAGS = $(PFLAGS)
-libscale_la_LIBADD = @BERYL_LIBS@
+libscale_la_LIBADD = @BERYL_LIBS@ @BERYLSETTINGS_LIBS@
libscale_la_SOURCES = scale.c
libwobbly_la_LDFLAGS = $(PFLAGS)
-libwobbly_la_LIBADD = @BERYL_LIBS@
+libwobbly_la_LIBADD = @BERYL_LIBS@ @BERYLSETTINGS_LIBS@
libwobbly_la_SOURCES = wobbly.c
libanimation_la_LDFLAGS = $(PFLAGS)
-libanimation_la_LIBADD = @BERYL_LIBS@
+libanimation_la_LIBADD = @BERYL_LIBS@ @BERYLSETTINGS_LIBS@
libanimation_la_SOURCES = animation.c animation_tex.h
libmove_la_LDFLAGS = $(PFLAGS)
-libmove_la_LIBADD = @BERYL_LIBS@
+libmove_la_LIBADD = @BERYL_LIBS@ @BERYLSETTINGS_LIBS@
libmove_la_SOURCES = move.c
libresize_la_LDFLAGS = $(PFLAGS)
-libresize_la_LIBADD = @BERYL_LIBS@
+libresize_la_LIBADD = @BERYL_LIBS@ @BERYLSETTINGS_LIBS@
libresize_la_SOURCES = resize.c
libdecoration_la_LDFLAGS = $(PFLAGS)
-libdecoration_la_LIBADD = @BERYL_LIBS@
+libdecoration_la_LIBADD = @BERYL_LIBS@ @BERYLSETTINGS_LIBS@
libdecoration_la_SOURCES = decoration.c
libswitcher_la_LDFLAGS = $(PFLAGS)
-libswitcher_la_LIBADD = @BERYL_LIBS@
+libswitcher_la_LIBADD = @BERYL_LIBS@ @BERYLSETTINGS_LIBS@
libswitcher_la_SOURCES = switcher.c
libstate_la_LDFLAGS = $(PFLAGS)
-libstate_la_LIBADD = @BERYL_LIBS@
+libstate_la_LIBADD = @BERYL_LIBS@ @BERYLSETTINGS_LIBS@
libstate_la_SOURCES = state.c
libwater_la_LDFLAGS = $(PFLAGS)
-libwater_la_LIBADD = @BERYL_LIBS@
+libwater_la_LIBADD = @BERYL_LIBS@ @BERYLSETTINGS_LIBS@
libwater_la_SOURCES = water.c
libneg_la_LDFLAGS = $(PFLAGS)
-libneg_la_LIBADD = @BERYL_LIBS@
+libneg_la_LIBADD = @BERYL_LIBS@ @BERYLSETTINGS_LIBS@
libneg_la_SOURCES = neg.c
libplace_la_LDFLAGS = $(PFLAGS)
-libplace_la_LIBADD = @BERYL_LIBS@ @GLIB_LIBS@
+libplace_la_LIBADD = @BERYL_LIBS@ @GLIB_LIBS@ @BERYLSETTINGS_LIBS@
libplace_la_SOURCES = place.c
lib3d_la_LDFLAGS = $(PFLAGS)
-lib3d_la_LIBADD = @BERYL_LIBS@
+lib3d_la_LIBADD = @BERYL_LIBS@ @BERYLSETTINGS_LIBS@
lib3d_la_SOURCES = 3d.c
libsnow_la_LDFLAGS = $(PFLAGS)
-libsnow_la_LIBADD = @BERYL_LIBS@
+libsnow_la_LIBADD = @BERYL_LIBS@ @BERYLSETTINGS_LIBS@
libsnow_la_SOURCES = snow.c
libopacify_la_LDFLAGS = $(PFLAGS)
-libopacify_la_LIBADD = @BERYL_LIBS@
+libopacify_la_LIBADD = @BERYL_LIBS@ @BERYLSETTINGS_LIBS@
libopacify_la_SOURCES = opacify.c