summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2006-01-18 20:50:59 +0000
committerAdam Jackson <ajax@nwnk.net>2006-01-18 20:50:59 +0000
commit806db5e7f9bc3c65e596a78aa0b9e59fba911cc1 (patch)
tree06815f04eea7417d32d61e3e5c3bf254f6a4a32e
parentd4e0e8ea91612e570be18ae5eb3779d2848bb809 (diff)
Deconfuse automake.
-rw-r--r--ChangeLog3
-rw-r--r--plugins/Makefile.am7
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index ed55858..ffc2f2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@
* src/screen.c:
Also check for EXT_tfd in the GLX extension string.
+ * plugins/Makefile.am:
+ Deconfuse automake.
+
2005-12-31 Zack Rusin <zack@freedesktop.org>
Initial import. (David Reveman)
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 827fc3d..cca12bb 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -30,7 +30,8 @@ if GCONF_PLUGIN
libgconf_la_LDFLAGS = -avoid-version
libgconf_la_LIBADD = @GLXCOMP_LIBS@ @GCONF_LIBS@
libgconf_la_SOURCES = gconf.c
-libgconf_library = libgconf.la
+libgconf_LTLIBRARIES = libgconf.la
+libgconfdir = $(plugindir)
libgconf_includes = @GCONF_CFLAGS@
endif
@@ -43,12 +44,10 @@ INCLUDES = \
moduledir = $(plugindir)
module_LTLIBRARIES = \
- libgconf.la \
libfade.la \
libcube.la \
librotate.la \
libzoom.la \
libexpose.la \
libwobbly.la \
- libshadow.la \
- $(libgconf_library)
+ libshadow.la