Re: [PATCH] extract gifs from icons.shar at make time

Ahh. I didn't delete my installed icons when testing it. Doh. (I always build outside the source dir though)

Duane - do you want another patch sent in, or are Henrik's comments enough?

Rob

----- Original Message -----
From: "Henrik Nordstrom" <hno@hem.passagen.se>
To: "Robert Collins" <robert.collins@itdomain.com.au>
Cc: <squid-dev@squid-cache.org>
Sent: Thursday, December 14, 2000 3:56 AM
Subject: Re: [PATCH] extract gifs from icons.shar at make time

> You better tunnel it via a phony target to avoid multiple invocations on
> parallell builds, and then you also need to care for builds outside of
> the source directory. install expects the icons to be in the source
> directory...
>
>
> .PHONY: extract_icons
> $(ICONS): extract_icons
> extract_icons:
> @$(SHELL) -c "cd $(srcdir); $(SHELL) $(srcdir)/icons.shar"
>
> /Henrik
>
>
> Robert Collins wrote:
> >
> > Take two
> >
> > file starts on the next line
> > Index: icons/Makefile.in
> > ===================================================================
> > RCS file: /cvsroot/squid/squid/icons/Makefile.in,v
> > retrieving revision 1.1.1.3.12.1
> > diff -u -r1.1.1.3.12.1 Makefile.in
> > --- icons/Makefile.in 2000/05/03 19:18:11 1.1.1.3.12.1
> > +++ icons/Makefile.in 2000/12/09 01:45:51
> > @@ -45,12 +45,15 @@
> > anthony-xbm.gif \
> > anthony-xpm.gif
> >
> > -all:
> > +all: $(ICONS)
> >
> > +$(ICONS):
> > + @$(SHELL) -c "$(SHELL) $(srcdir)/icons.shar"
> > +
> > icons.shar:
> > shar --no-timestamp $(ICONS) > $@
> >
> > -install: install-mkdirs anthony-xpm.gif
> > +install: all install-mkdirs
> > @for f in $(ICONS); do \
> > if test -f $(DEFAULT_ICON_DIR)/$$f ; then \
> > :; \
>
>
Received on Wed Dec 13 2000 - 12:57:21 MST