summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Ferretti <elle.uca@libero.it>2007-10-31 13:29:35 +0000
committerLuca Ferretti <lferrett@src.gnome.org>2007-10-31 13:29:35 +0000
commit5d362edc8cf22497ed0494fdb460dd78fa2081ba (patch)
tree09da69980fde30eb2c169ee354f7ac2b7845c2a1
parent0213aab4e6d4c402ffe5d5473faaf7c23123894a (diff)
downloadgdm-5d362edc8cf22497ed0494fdb460dd78fa2081ba.tar.gz
Added new data/ directory to SUBDIRS. Added new data/* directories to
2007-10-31 Luca Ferretti <elle.uca@libero.it> * Makefile.am: Added new data/ directory to SUBDIRS. * configure.ac: Added new data/* directories to AC_OUTPUT. * ChangeLog: add related bugs (#477799 and #477983) to previous entry. svn path=/branches/gnome-2-20/; revision=5469
-rw-r--r--ChangeLog8
-rw-r--r--Makefile.am1
-rw-r--r--configure.ac14
3 files changed, 22 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8f9d0db7..627e7005 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,14 @@
2007-10-31 Luca Ferretti <elle.uca@libero.it>
+ * Makefile.am: Added new data/ directory to SUBDIRS.
+ * configure.ac: Added new data/* directories to AC_OUTPUT.
+
+2007-10-31 Luca Ferretti <elle.uca@libero.it>
+
* data/*: Added new data/ directory to svn, storing
by now icons/ directory with new named icons for gdm:
- "gdmsetup" and "gdmflexiserver".
+ "gdmsetup" and "gdmflexiserver".
+ See bugs #477799 and #477983.
2007-10-15 Brian Cameron <brian.cameron@sun.com>
diff --git a/Makefile.am b/Makefile.am
index 280ebd1f..55515d5d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,6 +9,7 @@ SUBDIRS = \
gui \
utils \
docs \
+ data \
$(NULL)
# add these when help gets added back
diff --git a/configure.ac b/configure.ac
index 24a4d8d1..bf2f2118 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1371,6 +1371,20 @@ AC_DEFINE_UNQUOTED(X_XNEST_UNSCALED_FONTPATH,"$X_XNEST_UNSCALED_FONTPATH")
AC_OUTPUT([
Makefile
daemon/Makefile
+data/Makefile
+data/icons/Makefile
+data/icons/16x16/Makefile
+data/icons/16x16/apps/Makefile
+data/icons/22x22/Makefile
+data/icons/22x22/apps/Makefile
+data/icons/24x24/Makefile
+data/icons/24x24/apps/Makefile
+data/icons/32x32/Makefile
+data/icons/32x32/apps/Makefile
+data/icons/48x48/Makefile
+data/icons/48x48/apps/Makefile
+data/icons/scalable/Makefile
+data/icons/scalable/apps/Makefile
gui/Makefile
gui/gdmflexiserver-xnest.desktop.in
gui/faces/Makefile