summaryrefslogtreecommitdiff
path: root/beryl-plugins/src/Makefile.am
diff options
context:
space:
mode:
authorquinn <quinn@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2007-01-06 22:52:36 +0000
committerquinn <quinn@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2007-01-06 22:52:36 +0000
commitcd2955b959ef32fac34fbcbf279d00bff90284aa (patch)
treee4fe19e61a882e4e6a82c45825c6aa3f98608ebb /beryl-plugins/src/Makefile.am
parentd1bde8b5afe2cc86ac52bad900f3889e69dbd5e0 (diff)
downloadmarex-dev-cd2955b959ef32fac34fbcbf279d00bff90284aa.tar.gz
marex-dev-cd2955b959ef32fac34fbcbf279d00bff90284aa.tar.bz2
beryl-*:
* move active_plugins out * use the new enabled structure * WARNING - this breaks BSM! USE BSMPP! git-svn-id: file:///beryl/trunk@2434 d7aaf104-2d23-0410-ae22-9d23157bf5a3
Diffstat (limited to 'beryl-plugins/src/Makefile.am')
-rw-r--r--beryl-plugins/src/Makefile.am6
1 files changed, 3 insertions, 3 deletions
diff --git a/beryl-plugins/src/Makefile.am b/beryl-plugins/src/Makefile.am
index 863e6a0..40c6a11 100644
--- a/beryl-plugins/src/Makefile.am
+++ b/beryl-plugins/src/Makefile.am
@@ -41,8 +41,8 @@ libcrashhandler_la_LIBADD = @BERYL_LIBS@ @BERYLSETTINGS_LIBS@
libcrashhandler_la_SOURCES = crashhandler.c
if JPEG_PLUGIN
-libjpeg_la_LDFLAGS = $(PFLAGS)
-libjpeg_la_LIBADD = @BERYL_LIBS@ @BERYLSETTINGS_LIBS@ -ljpeg
+libjpeg_la_LDFLAGS = $(PFLAGS) -ljpeg
+libjpeg_la_LIBADD = @BERYL_LIBS@ @BERYLSETTINGS_LIBS@
libjpeg_la_SOURCES = jpeg.c
libjpeg_module = libjpeg.la
endif
@@ -193,5 +193,5 @@ module_LTLIBRARIES = \
libpng.la \
libsnow.la \
libopacify.la \
- $(libjpeg_module)
+ $(libjpeg_module) \
$(libannotate_module)