Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Stone <michael@laptop.org>2010-06-27 21:37:22 (GMT)
committer Michael Stone <michael@laptop.org>2010-06-27 21:37:22 (GMT)
commitfd07a21971abdd3ef6d806a62f0749fc4119bf1c (patch)
tree4833c41e44018098934a6b8eb863bfd31a00cc32
parent5d92f0797c2fe4dc942072238015f8f9dd9439d5 (diff)
Move generation of presence-service/src/config.py into the Makefile.
-rw-r--r--Makefile6
-rwxr-xr-xconfigure4
2 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index c88deab..f8e2bdf 100644
--- a/Makefile
+++ b/Makefile
@@ -149,6 +149,9 @@ artwork/gtk/theme/sugar-%.gtkrc: artwork/gtk/theme/gtkrc.em
presence-service/sugar-presence-service: presence-service/src/sugar-presence-service.in
sed -e "s,@prefix@,$(DESTDIR)$(prefix)," $^ > $@
+presence-service/src/config.py: config.mk
+ echo "VERSION = \"$(SUCROSE_VERSION)\"" > $@
+
# End PS binary.
# Cursors
@@ -178,7 +181,7 @@ TOOLKIT_PYTHON_FILES=$(shell cd toolkit/src; find * -name '*.py') sugar/_sugarex
ARTWORK_THEME_FILES=artwork/icons/index.theme
PS_PYTHON_DIRS=sugar-presence-service
-PS_PYTHON_FILES=$(shell cd presence-service/src; find * -name '*.py')
+PS_PYTHON_FILES=$(shell cd presence-service/src; find * -name '*.py') config.py
PS_PYTHON_SITEPACKAGES:=$(DESTDIR)/$(prefix)/share/sugar-presence-service
EXTENSION_DIRS=$(shell cd main/extensions; find * -type d)
@@ -189,6 +192,7 @@ PYTHON_DIRS = $(DS_PYTHON_DIRS) $(BASE_PYTHON_DIRS) $(MAIN_PYTHON_DIRS) $(TOOLKI
all: $(BINARIES) $(DATA) $(DBUS_FILES) \
$(addprefix datastore/src/,$(DS_PYTHON_FILES)) \
+ $(addprefix presence-service/src/,$(PS_PYTHON_FILES)) \
$(addprefix base/src/,$(BASE_PYTHON_FILES)) \
$(addprefix main/src/,$(MAIN_PYTHON_FILES)) \
$(addprefix toolkit/src/,$(TOOLKIT_PYTHON_FILES)) \
diff --git a/configure b/configure
index 174eea9..a4f9c94 100755
--- a/configure
+++ b/configure
@@ -42,7 +42,3 @@ MIMEDIR ?= \$(DATADIR)/mime/packages
SUCROSE_VERSION = ${SUCROSE_VERSION}
PKG_CONFIG ?= ${PKG_CONFIG}
EOF
-
-cat > presence-service/src/config.py <<EOF
-VERSION = "${SUCROSE_VERSION}"
-EOF