[gnome-color-manager] Move the AppData file into it's own directory



commit ae0396b005d6e3b75481222a765e3a811b849bde
Author: Richard Hughes <richard hughsie com>
Date:   Tue Oct 8 12:11:42 2013 +0100

    Move the AppData file into it's own directory
    
    The screenshots will also live here soon.

 configure.ac                                 |    1 +
 data/Makefile.am                             |   10 +---------
 data/appdata/Makefile.am                     |    6 ++++++
 data/{ => appdata}/gcm-viewer.appdata.xml.in |    0
 data/gcm-viewer.appdata.xml                  |   14 --------------
 po/POTFILES.in                               |    2 +-
 6 files changed, 9 insertions(+), 24 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index aaed691..1d4e0a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -209,6 +209,7 @@ dnl ---------------------------------------------------------------------------
 AC_CONFIG_FILES([
 Makefile
 data/Makefile
+data/appdata/Makefile
 data/icons/Makefile
 data/icons/16x16/Makefile
 data/icons/22x22/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index b769945..3d62903 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,5 @@
 SUBDIRS =                                              \
+       appdata                                         \
        ti1                                             \
        tests                                           \
        targets                                         \
@@ -14,18 +15,12 @@ desktop_in_files =                                  \
        gcm-import.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
- INTLTOOL_XML_RULE@
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-appdata_in_files = gcm-viewer.appdata.xml.in
-
 UI_FILES =                                             \
        gcm-picker.ui                                   \
        gcm-viewer.ui
 
 EXTRA_DIST =                                           \
        $(service_in_files)                             \
-       $(appdata_in_files)                             \
        $(autostart_in_files)                           \
        $(desktop_in_files)                             \
        $(UI_FILES)
@@ -33,9 +28,6 @@ EXTRA_DIST =                                          \
 clean-local :
        rm -f *~
 
-CLEANFILES =                                           \
-       $(appdata_DATA)
-
 DISTCLEANFILES =                                       \
        org.gnome.ColorManager.service                  \
        gcm-calibrate.desktop                           \
diff --git a/data/appdata/Makefile.am b/data/appdata/Makefile.am
new file mode 100644
index 0000000..a1d2d5c
--- /dev/null
+++ b/data/appdata/Makefile.am
@@ -0,0 +1,6 @@
+ INTLTOOL_XML_RULE@
+appdatadir = $(datadir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+appdata_in_files = gcm-viewer.appdata.xml.in
+EXTRA_DIST = $(appdata_in_files)
+CLEANFILES = $(appdata_DATA)
diff --git a/data/gcm-viewer.appdata.xml.in b/data/appdata/gcm-viewer.appdata.xml.in
similarity index 100%
rename from data/gcm-viewer.appdata.xml.in
rename to data/appdata/gcm-viewer.appdata.xml.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 21474ef..faacfa0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,7 +2,7 @@ data/gcm-calibrate.desktop.in
 data/gcm-import.desktop.in
 data/gcm-picker.desktop.in
 [type: gettext/glade]data/gcm-picker.ui
-data/gcm-viewer.appdata.xml.in
+data/appdata/gcm-viewer.appdata.xml.in
 data/gcm-viewer.desktop.in
 [type: gettext/glade]data/gcm-viewer.ui
 src/gcm-calibrate-argyll.c


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]