Mercurial > pidgin
diff Makefile.am @ 20407:1122d47583a1
explicit merge of 'd42ad2da81f881b2fbd2fb080cc70a843bc70d02'
and '8582c561c020d2d1e8d358e2e7cd9e3da113ed9e'
to branch 'im.pidgin.cpw.khc.msnp14'
author | Ka-Hing Cheung <khc@hxbc.us> |
---|---|
date | Wed, 02 May 2007 05:25:27 +0000 |
parents | 83ec0b408926 |
children | 8748c83af14f |
line wrap: on
line diff
--- a/Makefile.am Sun Apr 15 20:12:06 2007 +0000 +++ b/Makefile.am Wed May 02 05:25:27 2007 +0000 @@ -7,13 +7,11 @@ Makefile.mingw \ PLUGIN_HOWTO \ PROGRAMMING_NOTES \ - README.SVN \ - README.dbus \ + README.MTN \ README.mingw \ config.h.mingw \ gaim.pc.in \ gaim-uninstalled.pc.in \ - gaim.service.in \ intltool-extract.in \ intltool-merge.in \ intltool-update.in \ @@ -24,11 +22,6 @@ noinst_HEADERS = config.h -if ENABLE_DBUS -dbus_servicedir=$(DBUS_SERVICES_DIR) -dbus_service_DATA=gaim.service -endif - dist-hook: pidgin.spec cp pidgin.spec $(distdir) rm $(distdir)/config.h