1.1 --- a/app-manager/Makefile.am	Mon Jan 30 13:35:28 2012 +0000
     1.2 +++ b/app-manager/Makefile.am	Fri Apr 15 13:09:11 2016 +0100
     1.3 @@ -3,12 +3,15 @@
     1.4  
     1.5  bin_PROGRAMS=app-manager fetch
     1.6  app_manager_SOURCES=app-manager.c app-manager.h packagelist.c applications.c \
     1.7 -	localmedia.c localmedia.h
     1.8 +	localmedia.c localmedia.h setup.c update.c
     1.9  fetch_SOURCES=fetch.c
    1.10  fetch_LDADD=$(LDADD) $(FETCH_LIBS)
    1.11  if HAVE_WINDRES
    1.12  app_manager_SOURCES+=resources.rc app-manager.exe.manifest
    1.13  endif
    1.14 +if PLOVER_MINGW
    1.15 +app_manager_LDFLAGS=-mwindows
    1.16 +endif
    1.17  uidir=$(pkgdatadir)
    1.18  ui_DATA=app-manager.ui
    1.19  desktopdir=$(datadir)/applications
    1.20 @@ -20,34 +23,39 @@
    1.21  bigicondir=$(datadir)/icons/hicolor/48x48/apps
    1.22  bigicon_DATA=48x48/plover-applications.png
    1.23  
    1.24 +# PLOVER_V_SKIP: Don't echo anything for this command if V=0
    1.25 +PLOVER_V_SKIP = $(PLOVER_V_SKIP_$(V))
    1.26 +PLOVER_V_SKIP_ = $(PLOVER_V_SKIP_$(AM_DEFAULT_VERBOSITY))
    1.27 +PLOVER_V_SKIP_0 = @
    1.28 +
    1.29  .rc.$(OBJEXT):
    1.30 -	$(WINDRES) $< $@
    1.31 +	$(AM_V_GEN)$(WINDRES) $< $@
    1.32  
    1.33  resources.$(OBJEXT):	app-manager.ico app-manager.exe.manifest
    1.34  
    1.35  plover-applications%.pnm:	plover-applications.svg
    1.36 -	rsvg -w $* -h $* -f png $< temp.png
    1.37 -	pngtopnm temp.png | pnmquant 256 > $@
    1.38 -	$(RM) temp.png
    1.39 +	$(PLOVER_V_SKIP)rsvg -w $* -h $* -f png $< temp.png
    1.40 +	$(AM_V_GEN)pngtopnm temp.png | pnmquant -quiet 256 > $@
    1.41 +	$(PLOVER_V_SKIP)$(RM) temp.png
    1.42  
    1.43  plover-applications%.pgm:	plover-applications.svg
    1.44 -	rsvg -w $* -h $* -f png $< temp.png
    1.45 -	pngtopnm -alpha temp.png > $@
    1.46 -	$(RM) temp.png
    1.47 +	$(PLOVER_V_SKIP)rsvg -w $* -h $* -f png $< temp.png
    1.48 +	$(AM_V_GEN)pngtopnm -alpha temp.png > $@
    1.49 +	$(PLOVER_V_SKIP)$(RM) temp.png
    1.50  
    1.51  24x24/plover-applications.png:	plover-applications.svg
    1.52 -	mkdir -p 24x24
    1.53 -	rsvg -w 24 -h 24 -f png $< $@
    1.54 +	$(PLOVER_V_SKIP)mkdir -p 24x24
    1.55 +	$(AM_V_GEN)rsvg -w 24 -h 24 -f png $< $@
    1.56  
    1.57  48x48/plover-applications.png:	plover-applications.svg
    1.58 -	mkdir -p 48x48
    1.59 -	rsvg -w 48 -h 48 -f png $< $@
    1.60 +	$(PLOVER_V_SKIP)mkdir -p 48x48
    1.61 +	$(AM_V_GEN)rsvg -w 48 -h 48 -f png $< $@
    1.62  
    1.63  app-manager.ico:	plover-applications16.pnm plover-applications16.pgm \
    1.64  		plover-applications22.pnm plover-applications22.pgm \
    1.65  		plover-applications32.pnm plover-applications32.pgm \
    1.66  		plover-applications46.pnm plover-applications46.pgm
    1.67 -	ppmtowinicon -andpgms -output=$@ $^
    1.68 +	$(AM_V_GEN)ppmtowinicon -andpgms -output=$@ $^
    1.69  
    1.70  clean-local:
    1.71  	-rm -rf 24x24 48x48