From 8f7db1ac5687fdec4f29ab2c893a7bb42f50fd80 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu@sugarlabs.org>
Date: Sat, 19 Sep 2009 11:22:37 +0000
Subject: Don't distribute autogenerated files

---
diff --git a/configure.ac b/configure.ac
index 6aa9cef..88d1e67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,40 +43,40 @@ AM_GCONF_SOURCE_2
 
 
 AC_CONFIG_FILES([
-bin/sugar
-src/jarabe/config.py
-])
-
-AC_OUTPUT([
-Makefile
 bin/Makefile
+bin/sugar
+data/icons/Makefile
 data/Makefile
 data/sugar-emulator.desktop
-data/icons/Makefile
-extensions/Makefile
-extensions/cpsection/Makefile
-extensions/cpsection/aboutme/Makefile
 extensions/cpsection/aboutcomputer/Makefile
+extensions/cpsection/aboutme/Makefile
 extensions/cpsection/datetime/Makefile
 extensions/cpsection/frame/Makefile
 extensions/cpsection/keyboard/Makefile
 extensions/cpsection/language/Makefile
+extensions/cpsection/Makefile
 extensions/cpsection/network/Makefile
 extensions/cpsection/power/Makefile
-extensions/cpsection/updater/Makefile
 extensions/cpsection/updater/backends/Makefile
+extensions/cpsection/updater/Makefile
 extensions/deviceicon/Makefile
 extensions/globalkey/Makefile
-src/Makefile
-src/jarabe/Makefile
+extensions/Makefile
+Makefile
+po/Makefile.in
+src/jarabe/config.py
 src/jarabe/controlpanel/Makefile
 src/jarabe/desktop/Makefile
 src/jarabe/frame/Makefile
 src/jarabe/intro/Makefile
 src/jarabe/journal/Makefile
-src/jarabe/view/Makefile
+src/jarabe/Makefile
 src/jarabe/model/Makefile
 src/jarabe/util/Makefile
 src/jarabe/util/telepathy/Makefile
-po/Makefile.in
+src/jarabe/view/Makefile
+src/Makefile
 ])
+
+AC_OUTPUT
+
diff --git a/data/Makefile.am b/data/Makefile.am
index 85c091f..6674388 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -61,5 +61,5 @@ if GCONF_SCHEMAS_INSTALL
 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule sugar.schemas 2>&1 > /dev/null
 endif
 
-EXTRA_DIST = $(sugar_DATA) $(xsessions_DATA) $(applications_DATA) $(nmservice_DATA) $(mime_xml_in_files) em.py gtkrc.em $(schema_in_files)
+EXTRA_DIST = $(sugar_DATA) $(xsessions_DATA) $(nmservice_DATA) $(mime_xml_in_files) em.py gtkrc.em $(schema_in_files)
 CLEANFILES = $(GTKRC_FILES) $(mime_xml_files) $(schema_DATA)
diff --git a/src/jarabe/Makefile.am b/src/jarabe/Makefile.am
index 42bf075..84bb213 100644
--- a/src/jarabe/Makefile.am
+++ b/src/jarabe/Makefile.am
@@ -9,6 +9,8 @@ SUBDIRS = 		\
 	util
 
 sugardir = $(pythondir)/jarabe
-sugar_PYTHON =			\
-        __init__.py		\
-	config.py
+sugar_PYTHON =		\
+	__init__.py
+
+nodist_sugar_PYTHON = config.py
+
--
cgit v0.9.1