soc.2008.masterpassword: e574c937: Cleanup and shorten Makefile.am.

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: e574c9373d5d4117fa7ae36e8247dfbb38017935
Parent:   53a2e3f2b5a45591b498230cc8331d34a90f19a6
Author:   qulogic at pidgin.im
Date:     11/06/11 01:20:37
Branch:   im.pidgin.soc.2008.masterpassword
URL: http://d.pidgin.im/viewmtn/revision/info/e574c9373d5d4117fa7ae36e8247dfbb38017935

Changelog: 

Cleanup and shorten Makefile.am.

Changes against parent 53a2e3f2b5a45591b498230cc8331d34a90f19a6

  patched  libpurple/plugins/keyrings/Makefile.am

-------------- next part --------------
============================================================
--- libpurple/plugins/keyrings/Makefile.am	11823600697c4dd93910bf0543652c913cbcf89f
+++ libpurple/plugins/keyrings/Makefile.am	beca4dc612ae16f8ee63b4ad26e901c289f14a9e
@@ -3,52 +3,38 @@ plugindir = $(libdir)/purple-$(PURPLE_MA
 
 plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
 
+internalkeyring_la_CFLAGS  = $(AM_CPPFLAGS)
+internalkeyring_la_LDFLAGS = -module -avoid-version
+internalkeyring_la_SOURCES = internalkeyring.c
+internalkeyring_la_LIBADD  = $(GLIB_LIBS)
 
 if ENABLE_GNOMEKEYRING
 
-gnomekeyring_la_LDFLAGS     = -module -avoid-version
-GKRSOURCES = gnomekeyring.c
-#GNOME_KEYRING_CFLAGS = -I/usr/include/gnome-keyring-1
-#GNOME_KEYRING_LIBS   = -lgnome-keyring
-GNOME_KEYRING_LA = gnomekeyring.la
+gnomekeyring_la_CFLAGS  = $(AM_CPPFLAGS) $(GNOMEKEYRING_CFLAGS)
+gnomekeyring_la_LDFLAGS = -module -avoid-version
+gnomekeyring_la_SOURCES = gnomekeyring.c
+gnomekeyring_la_LIBADD  = $(GLIB_LIBS) $(GNOMEKEYRING_LIBS)
 
-endif #ENABLE_GNOMEKEYRING
+endif
 
-internalkeyring_la_LDFLAGS  = -module -avoid-version
-IKSOURCES = internalkeyring.c
-
 if PLUGINS
 
 plugin_LTLIBRARIES = \
-	$(GNOME_KEYRING_LA)\
 	internalkeyring.la
 
-
 if ENABLE_GNOMEKEYRING
 
-gnomekeyring_la_SOURCES     = $(GKRSOURCES)
-gnomekeyring_la_LIBADD  = $(GLIB_LIBS) $(GNOMEKEYRING_LIBS)
+plugin_LTLIBRARIES += \
+	gnomekeyring.la
 
-endif #ENABLE_GNOMEKEYRING
+endif
 
-internalkeyring_la_SOURCES  = $(IKSOURCES)
-internalkeyring_la_LIBADD   = $(GLIB_LIBS)
+endif
 
-endif #PLUGINS
-
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
 	$(GLIB_CFLAGS) \
 	$(DEBUG_CFLAGS) \
-	$(PLUGIN_CFLAGS) \
-	$(GNOME_KEYRING_CFLAGS)
+	$(PLUGIN_CFLAGS)
 
-if ENABLE_GNOMEKEYRING
-gnomekeyring_la_CFLAGS = $(AM_CPPFLAGS) $(GNOMEKEYRING_CFLAGS)
-endif #ENABLE_GNOMEKEYRING
-
-internalkeyring_la_CFLAGS = $(AM_CPPFLAGS)
-
-
-