diff options
author | Stasiek Michalski <hellcp@opensuse.org> | 2019-08-06 17:24:53 +0200 |
---|---|---|
committer | Stasiek Michalski <hellcp@opensuse.org> | 2019-08-06 17:24:53 +0200 |
commit | 71da8c34bbb531ec2d96cb676bf6044f36c1f80f (patch) | |
tree | 7ae60473c5a72a7af7bd16fe7e94876cbfec9032 | |
parent | f4947c7e18197128d35873fa1dd6b19259f01bf0 (diff) | |
download | gdm-71da8c34bbb531ec2d96cb676bf6044f36c1f80f.tar.gz |
Removed unused pixmaps and references to pixmapdir
-rw-r--r-- | chooser/Makefile.am | 1 | ||||
-rw-r--r-- | common/Makefile.am | 1 | ||||
-rw-r--r-- | configure.ac | 5 | ||||
-rw-r--r-- | data/Makefile.am | 2 | ||||
-rw-r--r-- | data/pixmaps/16x16/Makefile.am | 12 | ||||
-rw-r--r-- | data/pixmaps/16x16/gdm-xnest.png | bin | 429 -> 0 bytes | |||
-rw-r--r-- | data/pixmaps/32x32/Makefile.am | 13 | ||||
-rw-r--r-- | data/pixmaps/32x32/gdm-setup.png | bin | 1393 -> 0 bytes | |||
-rw-r--r-- | data/pixmaps/32x32/gdm-xnest.png | bin | 1012 -> 0 bytes | |||
-rw-r--r-- | data/pixmaps/48x48/Makefile.am | 14 | ||||
-rw-r--r-- | data/pixmaps/48x48/gdm-setup.png | bin | 2504 -> 0 bytes | |||
-rw-r--r-- | data/pixmaps/48x48/gdm-xnest.png | bin | 1370 -> 0 bytes | |||
-rw-r--r-- | data/pixmaps/48x48/gdm.png | bin | 1608 -> 0 bytes | |||
-rw-r--r-- | data/pixmaps/Makefile.am | 12 | ||||
-rw-r--r-- | data/pixmaps/gdm-foot-logo.png | bin | 3684 -> 0 bytes | |||
-rw-r--r-- | data/pixmaps/nobody.png | bin | 5892 -> 0 bytes | |||
-rw-r--r-- | data/pixmaps/nohost.png | bin | 4196 -> 0 bytes |
17 files changed, 0 insertions, 60 deletions
diff --git a/chooser/Makefile.am b/chooser/Makefile.am index b649d38b..2576dde4 100644 --- a/chooser/Makefile.am +++ b/chooser/Makefile.am @@ -11,7 +11,6 @@ AM_CPPFLAGS = \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DSBINDIR=\""$(sbindir)"\" \ - -DPIXMAPDIR=\""$(pixmapdir)"\" \ -DAT_SPI_REGISTRYD_DIR="\"$(AT_SPI_REGISTRYD_DIR)\"" \ -DGNOME_SETTINGS_DAEMON_DIR="\"$(GNOME_SETTINGS_DAEMON_DIR)\"" \ $(GTK_CFLAGS) \ diff --git a/common/Makefile.am b/common/Makefile.am index a26b2bde..0f08d0b8 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -14,7 +14,6 @@ AM_CPPFLAGS = \ -DLIBDIR=\"$(libdir)\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DLOGDIR=\"$(logdir)\" \ - -DPIXMAPDIR=\"$(pixmapdir)\" \ -DSBINDIR=\"$(sbindir)\" \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -DGDM_DEFAULTS_CONF=\"$(GDM_DEFAULTS_CONF)\" \ diff --git a/configure.ac b/configure.ac index f59eebf4..1f189940 100644 --- a/configure.ac +++ b/configure.ac @@ -975,7 +975,6 @@ dnl - Define some variables to represent the directories we use. dnl --------------------------------------------------------------------------- AC_SUBST(gdmlocaledir, ${gdmconfdir}) -AC_SUBST(pixmapdir, ${datadir}/pixmaps) AC_ARG_WITH(log-dir, AS_HELP_STRING([--with-log-dir=<file>], @@ -1464,10 +1463,6 @@ data/gdm.conf data/Makefile data/applications/Makefile data/autostart/Makefile -data/pixmaps/Makefile -data/pixmaps/16x16/Makefile -data/pixmaps/32x32/Makefile -data/pixmaps/48x48/Makefile data/dconf/gdm common/Makefile po/Makefile.in diff --git a/data/Makefile.am b/data/Makefile.am index 210bf5d1..bda91604 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -4,7 +4,6 @@ EXTRA_DIST = SUBDIRS = \ applications \ autostart \ - pixmaps \ $(NULL) initdir = $(gdmconfdir)/Init @@ -75,7 +74,6 @@ $(schemas_DATA): $(schemas_in_files) -e 's,[@]libexecdir[@],$(libexecdir),g' \ -e 's,[@]gdmlocaledir[@],$(gdmlocaledir),g' \ -e 's,[@]logdir[@],$(logdir),g' \ - -e 's,[@]pixmapdir[@],$(pixmapdir),g' \ -e 's,[@]sbindir[@],$(sbindir),g' \ <$(srcdir)/gdm.schemas.in >gdm.schemas diff --git a/data/pixmaps/16x16/Makefile.am b/data/pixmaps/16x16/Makefile.am deleted file mode 100644 index 2ca6dca0..00000000 --- a/data/pixmaps/16x16/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -# This file will be processed with automake-1.7 to create Makefile.in - -appsicondir = \ - $(datadir)/icons/hicolor/16x16/apps -appsicon_DATA = \ - gdm-xnest.png - -EXTRA_DIST = \ - $(appsicon_DATA) - -MAINTAINERCLEANFILES = \ - Makefile.in diff --git a/data/pixmaps/16x16/gdm-xnest.png b/data/pixmaps/16x16/gdm-xnest.png Binary files differdeleted file mode 100644 index d9068d27..00000000 --- a/data/pixmaps/16x16/gdm-xnest.png +++ /dev/null diff --git a/data/pixmaps/32x32/Makefile.am b/data/pixmaps/32x32/Makefile.am deleted file mode 100644 index a4b5b4e1..00000000 --- a/data/pixmaps/32x32/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -# This file will be processed with automake-1.7 to create Makefile.in - -appsicondir = \ - $(datadir)/icons/hicolor/32x32/apps -appsicon_DATA = \ - gdm-setup.png \ - gdm-xnest.png - -EXTRA_DIST = \ - $(appsicon_DATA) - -MAINTAINERCLEANFILES = \ - Makefile.in diff --git a/data/pixmaps/32x32/gdm-setup.png b/data/pixmaps/32x32/gdm-setup.png Binary files differdeleted file mode 100644 index c3beb9e5..00000000 --- a/data/pixmaps/32x32/gdm-setup.png +++ /dev/null diff --git a/data/pixmaps/32x32/gdm-xnest.png b/data/pixmaps/32x32/gdm-xnest.png Binary files differdeleted file mode 100644 index 70721d75..00000000 --- a/data/pixmaps/32x32/gdm-xnest.png +++ /dev/null diff --git a/data/pixmaps/48x48/Makefile.am b/data/pixmaps/48x48/Makefile.am deleted file mode 100644 index 3582c785..00000000 --- a/data/pixmaps/48x48/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -# This file will be processed with automake-1.7 to create Makefile.in - -appsicondir = \ - $(datadir)/pixmaps -appsicon_DATA = \ - gdm.png \ - gdm-xnest.png \ - gdm-setup.png - -EXTRA_DIST = \ - $(appsicon_DATA) - -MAINTAINERCLEANFILES = \ - Makefile.in diff --git a/data/pixmaps/48x48/gdm-setup.png b/data/pixmaps/48x48/gdm-setup.png Binary files differdeleted file mode 100644 index f5f82f50..00000000 --- a/data/pixmaps/48x48/gdm-setup.png +++ /dev/null diff --git a/data/pixmaps/48x48/gdm-xnest.png b/data/pixmaps/48x48/gdm-xnest.png Binary files differdeleted file mode 100644 index e7328210..00000000 --- a/data/pixmaps/48x48/gdm-xnest.png +++ /dev/null diff --git a/data/pixmaps/48x48/gdm.png b/data/pixmaps/48x48/gdm.png Binary files differdeleted file mode 100644 index 9219a8ac..00000000 --- a/data/pixmaps/48x48/gdm.png +++ /dev/null diff --git a/data/pixmaps/Makefile.am b/data/pixmaps/Makefile.am deleted file mode 100644 index f2f7b562..00000000 --- a/data/pixmaps/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ - -SUBDIRS = \ - 16x16 32x32 48x48 - -pixmapdir = $(datadir)/pixmaps - -BITMAPS = gdm-foot-logo.png nobody.png nohost.png - -pixmap_DATA = $(BITMAPS) - -EXTRA_DIST = $(BITMAPS) - diff --git a/data/pixmaps/gdm-foot-logo.png b/data/pixmaps/gdm-foot-logo.png Binary files differdeleted file mode 100644 index 643e4c26..00000000 --- a/data/pixmaps/gdm-foot-logo.png +++ /dev/null diff --git a/data/pixmaps/nobody.png b/data/pixmaps/nobody.png Binary files differdeleted file mode 100644 index 1cd96a81..00000000 --- a/data/pixmaps/nobody.png +++ /dev/null diff --git a/data/pixmaps/nohost.png b/data/pixmaps/nohost.png Binary files differdeleted file mode 100644 index 12fc4015..00000000 --- a/data/pixmaps/nohost.png +++ /dev/null |