summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormonsta <[email protected]>2015-09-09 12:35:05 +0300
committermonsta <[email protected]>2015-09-09 12:35:05 +0300
commitaa3a853c9d06d0321e8924cbfbc42c8411f571f5 (patch)
tree7bca363d0bb67fddadbe6fd53e92c3b3db71db8d
parent0d36d61761a1d68839d61f521889dba3db7f514f (diff)
downloadmate-utils-aa3a853c9d06d0321e8924cbfbc42c8411f571f5.tar.bz2
mate-utils-aa3a853c9d06d0321e8924cbfbc42c8411f571f5.tar.xz
mate-screenshot: move stuff to data/ and src/ subdirs
-rw-r--r--configure.ac4
-rw-r--r--mate-screenshot/Makefile.am94
-rw-r--r--mate-screenshot/data/Makefile.am40
-rw-r--r--mate-screenshot/data/mate-screenshot.1 (renamed from mate-screenshot/mate-screenshot.1)0
-rw-r--r--mate-screenshot/data/mate-screenshot.appdata.xml.in (renamed from mate-screenshot/mate-screenshot.appdata.xml.in)0
-rw-r--r--mate-screenshot/data/mate-screenshot.convert (renamed from mate-screenshot/mate-screenshot.convert)0
-rw-r--r--mate-screenshot/data/mate-screenshot.desktop.in (renamed from mate-screenshot/mate-screenshot.desktop.in)0
-rw-r--r--mate-screenshot/data/mate-screenshot.ui (renamed from mate-screenshot/mate-screenshot.ui)0
-rw-r--r--mate-screenshot/data/org.mate.screenshot.gschema.xml.in (renamed from mate-screenshot/org.mate.screenshot.gschema.xml.in)0
-rw-r--r--mate-screenshot/src/Makefile.am44
-rw-r--r--mate-screenshot/src/mate-screenshot.c (renamed from mate-screenshot/mate-screenshot.c)0
-rw-r--r--mate-screenshot/src/screenshot-dialog.c (renamed from mate-screenshot/screenshot-dialog.c)0
-rw-r--r--mate-screenshot/src/screenshot-dialog.h (renamed from mate-screenshot/screenshot-dialog.h)0
-rw-r--r--mate-screenshot/src/screenshot-save.c (renamed from mate-screenshot/screenshot-save.c)0
-rw-r--r--mate-screenshot/src/screenshot-save.h (renamed from mate-screenshot/screenshot-save.h)0
-rw-r--r--mate-screenshot/src/screenshot-shadow.c (renamed from mate-screenshot/screenshot-shadow.c)0
-rw-r--r--mate-screenshot/src/screenshot-shadow.h (renamed from mate-screenshot/screenshot-shadow.h)0
-rw-r--r--mate-screenshot/src/screenshot-utils.c (renamed from mate-screenshot/screenshot-utils.c)0
-rw-r--r--mate-screenshot/src/screenshot-utils.h (renamed from mate-screenshot/screenshot-utils.h)0
-rw-r--r--mate-screenshot/src/screenshot-xfer.c (renamed from mate-screenshot/screenshot-xfer.c)0
-rw-r--r--mate-screenshot/src/screenshot-xfer.h (renamed from mate-screenshot/screenshot-xfer.h)0
-rw-r--r--po/POTFILES.in20
22 files changed, 98 insertions, 104 deletions
diff --git a/configure.ac b/configure.ac
index dbb306dd..2a9c107f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -417,7 +417,9 @@ mate-dictionary/help/Makefile
mate-dictionary/src/Makefile
mate-screenshot/Makefile
-mate-screenshot/org.mate.screenshot.gschema.xml
+mate-screenshot/data/Makefile
+mate-screenshot/data/org.mate.screenshot.gschema.xml
+mate-screenshot/src/Makefile
])
AC_OUTPUT
diff --git a/mate-screenshot/Makefile.am b/mate-screenshot/Makefile.am
index 7cce5d0c..29d83f25 100644
--- a/mate-screenshot/Makefile.am
+++ b/mate-screenshot/Makefile.am
@@ -1,94 +1,2 @@
-NULL =
+SUBDIRS = data src
-AM_CPPFLAGS = \
- -I. \
- -I$(srcdir) \
- -DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- -DUIDIR=\""$(uidir)"\" \
- $(DISABLE_DEPRECATED) \
- $(NULL)
-
-bin_PROGRAMS = \
- mate-screenshot \
- $(NULL)
-
-mate_screenshot_SOURCES = \
- mate-screenshot.c \
- screenshot-dialog.c \
- screenshot-dialog.h \
- screenshot-shadow.c \
- screenshot-shadow.h \
- screenshot-utils.c \
- screenshot-utils.h \
- screenshot-save.c \
- screenshot-save.h \
- screenshot-xfer.c \
- screenshot-xfer.h \
- $(NULL)
-
-mate_screenshot_CFLAGS = \
- $(GLIB_CFLAGS) \
- $(GIO_CFLAGS) \
- $(LIBCANBERRA_GTK_CFLAGS) \
- $(GTHREAD_CFLAGS) \
- $(GTK_CFLAGS) \
- $(NULL)
-
-mate_screenshot_LDFLAGS = -export-dynamic
-
-mate_screenshot_LDADD = \
- $(XSHAPE_LIBS) \
- $(GLIB_LIBS) \
- $(GIO_LIBS) \
- $(LIBCANBERRA_GTK_LIBS) \
- $(GTHREAD_LIBS) \
- $(GTK_LIBS) \
- -lm \
- $(NULL)
-
-mate_screenshotdir = $(datadir)/applications
-mate_screenshot_in_files = mate-screenshot.desktop.in
-mate_screenshot_DATA = $(mate_screenshot_in_files:.desktop.in=.desktop)
-
-man_MANS = mate-screenshot.1
-
-uidir = $(datadir)/mate-screenshot
-ui_DATA = \
- mate-screenshot.ui \
- $(NULL)
-
-appdatadir = $(datadir)/appdata
-appdata_in_files = mate-screenshot.appdata.xml.in
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-gsettings_SCHEMAS = org.mate.screenshot.gschema.xml
-
-convertdir = $(datadir)/MateConf/gsettings
-convert_DATA = mate-screenshot.convert
-
-EXTRA_DIST = \
- $(appdata_in_files) \
- $(mate_screenshot_in_files) \
- $(man_MANS) \
- $(ui_DATA) \
- $(convert_DATA) \
- $(NULL)
-
-CLEANFILES = \
- $(BUILT_SOURCES) \
- $(gsettings_SCHEMAS) \
- $(mate_screenshot_DATA) \
- $(sys_DATA) \
- $(appdata_DATA)
-
-dist-hook:
- cd $(distdir) ; rm -f $(CLEANFILES)
-
-install-exec-local:
- rm -f $(DESTDIR)$(bindir)/mate-panel-screenshot
- ln -s mate-screenshot $(DESTDIR)$(bindir)/mate-panel-screenshot
- rm -f $(DESTDIR)$(mandir)/man1/mate-panel-screenshot.1
- ln -s mate-screenshot.1 $(DESTDIR)$(mandir)/man1/mate-panel-screenshot.1
diff --git a/mate-screenshot/data/Makefile.am b/mate-screenshot/data/Makefile.am
new file mode 100644
index 00000000..b75f3162
--- /dev/null
+++ b/mate-screenshot/data/Makefile.am
@@ -0,0 +1,40 @@
+mate_screenshotdir = $(datadir)/applications
+mate_screenshot_in_files = mate-screenshot.desktop.in
+mate_screenshot_DATA = $(mate_screenshot_in_files:.desktop.in=.desktop)
+
+man_MANS = mate-screenshot.1
+
+uidir = $(datadir)/mate-screenshot
+ui_DATA = mate-screenshot.ui
+
+appdatadir = $(datadir)/appdata
+appdata_in_files = mate-screenshot.appdata.xml.in
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
+gsettings_SCHEMAS = org.mate.screenshot.gschema.xml
+
+convertdir = $(datadir)/MateConf/gsettings
+convert_DATA = mate-screenshot.convert
+
+EXTRA_DIST = \
+ $(appdata_in_files) \
+ $(mate_screenshot_in_files) \
+ $(man_MANS) \
+ $(ui_DATA) \
+ $(convert_DATA)
+
+CLEANFILES = \
+ $(gsettings_SCHEMAS) \
+ $(mate_screenshot_DATA) \
+ $(appdata_DATA)
+
+dist-hook:
+ cd $(distdir) ; rm -f $(CLEANFILES)
+
+install-exec-local:
+ rm -f $(DESTDIR)$(mandir)/man1/mate-panel-screenshot.1
+ ln -s mate-screenshot.1 $(DESTDIR)$(mandir)/man1/mate-panel-screenshot.1
+
diff --git a/mate-screenshot/mate-screenshot.1 b/mate-screenshot/data/mate-screenshot.1
index 8728c2dc..8728c2dc 100644
--- a/mate-screenshot/mate-screenshot.1
+++ b/mate-screenshot/data/mate-screenshot.1
diff --git a/mate-screenshot/mate-screenshot.appdata.xml.in b/mate-screenshot/data/mate-screenshot.appdata.xml.in
index 9d1200c1..9d1200c1 100644
--- a/mate-screenshot/mate-screenshot.appdata.xml.in
+++ b/mate-screenshot/data/mate-screenshot.appdata.xml.in
diff --git a/mate-screenshot/mate-screenshot.convert b/mate-screenshot/data/mate-screenshot.convert
index 741f7d44..741f7d44 100644
--- a/mate-screenshot/mate-screenshot.convert
+++ b/mate-screenshot/data/mate-screenshot.convert
diff --git a/mate-screenshot/mate-screenshot.desktop.in b/mate-screenshot/data/mate-screenshot.desktop.in
index fedc1321..fedc1321 100644
--- a/mate-screenshot/mate-screenshot.desktop.in
+++ b/mate-screenshot/data/mate-screenshot.desktop.in
diff --git a/mate-screenshot/mate-screenshot.ui b/mate-screenshot/data/mate-screenshot.ui
index 80382ed4..80382ed4 100644
--- a/mate-screenshot/mate-screenshot.ui
+++ b/mate-screenshot/data/mate-screenshot.ui
diff --git a/mate-screenshot/org.mate.screenshot.gschema.xml.in b/mate-screenshot/data/org.mate.screenshot.gschema.xml.in
index c926d737..c926d737 100644
--- a/mate-screenshot/org.mate.screenshot.gschema.xml.in
+++ b/mate-screenshot/data/org.mate.screenshot.gschema.xml.in
diff --git a/mate-screenshot/src/Makefile.am b/mate-screenshot/src/Makefile.am
new file mode 100644
index 00000000..fecac8cd
--- /dev/null
+++ b/mate-screenshot/src/Makefile.am
@@ -0,0 +1,44 @@
+AM_CPPFLAGS = \
+ -I. \
+ -I$(srcdir) \
+ -DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+ -DUIDIR=\""$(uidir)"\" \
+ $(DISABLE_DEPRECATED)
+
+bin_PROGRAMS = mate-screenshot
+
+mate_screenshot_SOURCES = \
+ mate-screenshot.c \
+ screenshot-dialog.c \
+ screenshot-dialog.h \
+ screenshot-shadow.c \
+ screenshot-shadow.h \
+ screenshot-utils.c \
+ screenshot-utils.h \
+ screenshot-save.c \
+ screenshot-save.h \
+ screenshot-xfer.c \
+ screenshot-xfer.h
+
+mate_screenshot_CFLAGS = \
+ $(GLIB_CFLAGS) \
+ $(GIO_CFLAGS) \
+ $(LIBCANBERRA_GTK_CFLAGS) \
+ $(GTHREAD_CFLAGS) \
+ $(GTK_CFLAGS)
+
+mate_screenshot_LDFLAGS = -export-dynamic
+
+mate_screenshot_LDADD = \
+ $(XSHAPE_LIBS) \
+ $(GLIB_LIBS) \
+ $(GIO_LIBS) \
+ $(LIBCANBERRA_GTK_LIBS) \
+ $(GTHREAD_LIBS) \
+ $(GTK_LIBS) \
+ -lm
+
+install-exec-local:
+ rm -f $(DESTDIR)$(bindir)/mate-panel-screenshot
+ ln -s mate-screenshot $(DESTDIR)$(bindir)/mate-panel-screenshot
+
diff --git a/mate-screenshot/mate-screenshot.c b/mate-screenshot/src/mate-screenshot.c
index 3e121f00..3e121f00 100644
--- a/mate-screenshot/mate-screenshot.c
+++ b/mate-screenshot/src/mate-screenshot.c
diff --git a/mate-screenshot/screenshot-dialog.c b/mate-screenshot/src/screenshot-dialog.c
index 7c5fae6d..7c5fae6d 100644
--- a/mate-screenshot/screenshot-dialog.c
+++ b/mate-screenshot/src/screenshot-dialog.c
diff --git a/mate-screenshot/screenshot-dialog.h b/mate-screenshot/src/screenshot-dialog.h
index 0cd5e1da..0cd5e1da 100644
--- a/mate-screenshot/screenshot-dialog.h
+++ b/mate-screenshot/src/screenshot-dialog.h
diff --git a/mate-screenshot/screenshot-save.c b/mate-screenshot/src/screenshot-save.c
index 5b870eec..5b870eec 100644
--- a/mate-screenshot/screenshot-save.c
+++ b/mate-screenshot/src/screenshot-save.c
diff --git a/mate-screenshot/screenshot-save.h b/mate-screenshot/src/screenshot-save.h
index 9df442d2..9df442d2 100644
--- a/mate-screenshot/screenshot-save.h
+++ b/mate-screenshot/src/screenshot-save.h
diff --git a/mate-screenshot/screenshot-shadow.c b/mate-screenshot/src/screenshot-shadow.c
index 052bb9f3..052bb9f3 100644
--- a/mate-screenshot/screenshot-shadow.c
+++ b/mate-screenshot/src/screenshot-shadow.c
diff --git a/mate-screenshot/screenshot-shadow.h b/mate-screenshot/src/screenshot-shadow.h
index c4162a5f..c4162a5f 100644
--- a/mate-screenshot/screenshot-shadow.h
+++ b/mate-screenshot/src/screenshot-shadow.h
diff --git a/mate-screenshot/screenshot-utils.c b/mate-screenshot/src/screenshot-utils.c
index eaeeca28..eaeeca28 100644
--- a/mate-screenshot/screenshot-utils.c
+++ b/mate-screenshot/src/screenshot-utils.c
diff --git a/mate-screenshot/screenshot-utils.h b/mate-screenshot/src/screenshot-utils.h
index b9d13f7b..b9d13f7b 100644
--- a/mate-screenshot/screenshot-utils.h
+++ b/mate-screenshot/src/screenshot-utils.h
diff --git a/mate-screenshot/screenshot-xfer.c b/mate-screenshot/src/screenshot-xfer.c
index a4cfeac1..a4cfeac1 100644
--- a/mate-screenshot/screenshot-xfer.c
+++ b/mate-screenshot/src/screenshot-xfer.c
diff --git a/mate-screenshot/screenshot-xfer.h b/mate-screenshot/src/screenshot-xfer.h
index 52262f11..52262f11 100644
--- a/mate-screenshot/screenshot-xfer.h
+++ b/mate-screenshot/src/screenshot-xfer.h
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 85b15eaf..4e504a70 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -62,13 +62,13 @@ mate-dictionary/src/gdict-window.c
mate-dictionary/src/main.c
[type: gettext/glade]mate-dictionary/data/mate-dictionary-preferences.ui
[type: gettext/glade]mate-dictionary/data/mate-dictionary-source.ui
-mate-screenshot/mate-screenshot.c
-mate-screenshot/mate-screenshot.appdata.xml.in
-mate-screenshot/mate-screenshot.desktop.in
-[type: gettext/glade]mate-screenshot/mate-screenshot.ui
-[type: gettext/gsettings]mate-screenshot/org.mate.screenshot.gschema.xml.in
-mate-screenshot/screenshot-dialog.c
-mate-screenshot/screenshot-save.c
-mate-screenshot/screenshot-shadow.c
-mate-screenshot/screenshot-utils.c
-mate-screenshot/screenshot-xfer.c
+mate-screenshot/data/mate-screenshot.appdata.xml.in
+mate-screenshot/data/mate-screenshot.desktop.in
+[type: gettext/glade]mate-screenshot/data/mate-screenshot.ui
+[type: gettext/gsettings]mate-screenshot/data/org.mate.screenshot.gschema.xml.in
+mate-screenshot/src/mate-screenshot.c
+mate-screenshot/src/screenshot-dialog.c
+mate-screenshot/src/screenshot-save.c
+mate-screenshot/src/screenshot-shadow.c
+mate-screenshot/src/screenshot-utils.c
+mate-screenshot/src/screenshot-xfer.c