From 9250827fc772af4ac19afadc763a58c70f58100b Mon Sep 17 00:00:00 2001 From: Keith Marshall Date: Mon, 16 Apr 2012 19:13:48 +0000 Subject: [PATCH] Assign icon to temporary GUI executable file. --- ChangeLog | 12 ++++++++++++ Makefile.in | 17 +++++++++++++++-- configure.ac | 4 +++- icons/pkgicon.ico | Bin 0 -> 7358 bytes 4 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 icons/pkgicon.ico diff --git a/ChangeLog b/ChangeLog index 9bcb471..11f42d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2012-04-16 Keith Marshall + + Assign icon to temporary GUI executable file. + + * icons/pkgicon.ico: New file, shamelessly copied from synaptic. + + * configure.ac: Add identification for windres; propagate it to... + * Makefile.in: ...here; use it to compile object from icon files... + (srcdir/icons) [%.ico]: ...from this new vpath location. + (gui.exe): Link to compiled icon's object file. + (SRCDIST_SUBDIRS): Add icons directory. + 2012-04-15 Keith Marshall Ensure that package removal requests are correctly scheduled. diff --git a/Makefile.in b/Makefile.in index 17dffc6..7458161 100644 --- a/Makefile.in +++ b/Makefile.in @@ -32,6 +32,7 @@ abs_top_srcdir = @abs_top_srcdir@ DEBUGLEVEL = @DEBUGLEVEL@ +vpath %.ico @srcdir@/icons VPATH = @top_srcdir@/src:@top_srcdir@/src/pkginfo:@top_srcdir@/tinyxml CC = @CC@ @@ -48,6 +49,8 @@ LEX = @LEX@ AR = @AR@ ARFLAGS = @ARFLAGS@ +WINDRES = @WINDRES@ + OBJEXT = @OBJEXT@ EXEEXT = @EXEEXT@ @@ -81,7 +84,17 @@ mingw-get$(EXEEXT): clistub.$(OBJEXT) version.$(OBJEXT) getopt.$(OBJEXT) GUI_LDFLAGS = -mwindows $(LDFLAGS) -gui$(EXEEXT): guimain.$(OBJEXT) +# FIXME: the following is a Q&D kludge, to assign my choice of icon +# to the GUI mode executable stub. Eventually, this will need to be +# assigned within a resource definition file, but for the time being, +# besides providing a notification that the GUI is not yet available, +# the stub serves only to illustrate mingw-get's shortcut creation +# capability; thus, this simple hack will suffice. +# +%.$(OBJEXT): %.ico + echo $* ICON $*.ico | $(WINDRES) -I ${srcdir}/icons -o $@ +# +gui$(EXEEXT): guimain.$(OBJEXT) pkgicon.$(OBJEXT) $(CXX) -o $@ $(CXXFLAGS) $(GUI_LDFLAGS) $+ lastrites$(EXEEXT): rites.$(OBJEXT) @@ -159,7 +172,7 @@ LICENCE_FILES = README COPYING SRCDIST_FILES = $(LICENCE_FILES) ChangeLog NEWS INSTALL \ aclocal.m4 configure.ac configure Makefile.in version.c.in -SRCDIST_SUBDIRS = build-aux m4 src src/pkginfo srcdist-doc \ +SRCDIST_SUBDIRS = build-aux icons m4 src src/pkginfo srcdist-doc \ scripts/libexec tinyxml xml # The names of distributed pacakge archive files incorporate version diff --git a/configure.ac b/configure.ac index 19c2243..7d80764 100644 --- a/configure.ac +++ b/configure.ac @@ -51,8 +51,10 @@ AC_PROG_CC AC_PROG_CXX -# We also need a lexical analyser generator +# We also need a Windows resource compiler, +# and a lexical analyser generator # + AC_CHECK_TOOL([WINDRES],[windres],[windres]) AC_PROG_LEX # Ensure that (at least the headers for) prerequisite libraries, diff --git a/icons/pkgicon.ico b/icons/pkgicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..4310b0eb96318f08b5ce07046ca07d7af42b1f93 GIT binary patch literal 7358 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 literal 0 HcmV?d00001 -- 2.11.0