From cf156fac07bcf7f81029a29d31f5a6b3e79080c8 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Fri, 01 Dec 2006 20:24:24 +0000
Subject: Get rid of our custom dbus config, simplify stuff

---
(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index 4ef729a..ac05c5d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,23 +2,10 @@ SUBDIRS = lib po shell sugar services tools
 
 ACLOCAL_AMFLAGS = -I m4
 
-dbusconfdir = $(pkgdatadir)
-dbusconf_DATA = dbus-installed.conf
-
 bin_SCRIPTS = 			\
 	sugar-emulator		\
 	sugar-emulator-shutdown
 
-install-data-local:
-	$(top_srcdir)/sugar/setup.py \
-		$(top_srcdir)/activities \
-		$(DESTDIR)$(pkgdatadir)/activities \
-		$(bindir)/sugar-activity-factory
-
-uninstall-local:
-	rm -rf $(DESTDIR)$(pkgdatadir)/activities/*.activity
-	rm -rf $(DESTDIR)$(pkgdatadir)/activities/*.service
-
 DISTCLEANFILES =		\
 	intltool-extract	\
 	intltool-merge		\
--
cgit v0.9.1