[gdm: 1/2] Removed unused pixmaps and references to pixmapdir



commit 71da8c34bbb531ec2d96cb676bf6044f36c1f80f
Author: Stasiek Michalski <hellcp opensuse org>
Date:   Tue Aug 6 17:24:53 2019 +0200

    Removed unused pixmaps and references to pixmapdir

 chooser/Makefile.am              |   1 -
 common/Makefile.am               |   1 -
 configure.ac                     |   5 -----
 data/Makefile.am                 |   2 --
 data/pixmaps/16x16/Makefile.am   |  12 ------------
 data/pixmaps/16x16/gdm-xnest.png | Bin 429 -> 0 bytes
 data/pixmaps/32x32/Makefile.am   |  13 -------------
 data/pixmaps/32x32/gdm-setup.png | Bin 1393 -> 0 bytes
 data/pixmaps/32x32/gdm-xnest.png | Bin 1012 -> 0 bytes
 data/pixmaps/48x48/Makefile.am   |  14 --------------
 data/pixmaps/48x48/gdm-setup.png | Bin 2504 -> 0 bytes
 data/pixmaps/48x48/gdm-xnest.png | Bin 1370 -> 0 bytes
 data/pixmaps/48x48/gdm.png       | Bin 1608 -> 0 bytes
 data/pixmaps/Makefile.am         |  12 ------------
 data/pixmaps/gdm-foot-logo.png   | Bin 3684 -> 0 bytes
 data/pixmaps/nobody.png          | Bin 5892 -> 0 bytes
 data/pixmaps/nohost.png          | Bin 4196 -> 0 bytes
 17 files changed, 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
 


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