diff -r 43df682785f5 -r e87a7db919c6 app-manager/Makefile.am --- a/app-manager/Makefile.am Mon Jan 30 13:35:28 2012 +0000 +++ b/app-manager/Makefile.am Fri Mar 08 13:51:08 2019 +0000 @@ -3,12 +3,15 @@ bin_PROGRAMS=app-manager fetch app_manager_SOURCES=app-manager.c app-manager.h packagelist.c applications.c \ - localmedia.c localmedia.h + localmedia.c localmedia.h setup.c update.c fetch_SOURCES=fetch.c fetch_LDADD=$(LDADD) $(FETCH_LIBS) if HAVE_WINDRES app_manager_SOURCES+=resources.rc app-manager.exe.manifest endif +if PLOVER_MINGW +app_manager_LDFLAGS=-mwindows +endif uidir=$(pkgdatadir) ui_DATA=app-manager.ui desktopdir=$(datadir)/applications @@ -20,34 +23,39 @@ bigicondir=$(datadir)/icons/hicolor/48x48/apps bigicon_DATA=48x48/plover-applications.png +# PLOVER_V_SKIP: Don't echo anything for this command if V=0 +PLOVER_V_SKIP = $(PLOVER_V_SKIP_$(V)) +PLOVER_V_SKIP_ = $(PLOVER_V_SKIP_$(AM_DEFAULT_VERBOSITY)) +PLOVER_V_SKIP_0 = @ + .rc.$(OBJEXT): - $(WINDRES) $< $@ + $(AM_V_GEN)$(WINDRES) $< $@ resources.$(OBJEXT): app-manager.ico app-manager.exe.manifest plover-applications%.pnm: plover-applications.svg - rsvg -w $* -h $* -f png $< temp.png - pngtopnm temp.png | pnmquant 256 > $@ - $(RM) temp.png + $(PLOVER_V_SKIP)rsvg -w $* -h $* -f png $< temp.png + $(AM_V_GEN)pngtopnm temp.png | pnmquant -quiet 256 > $@ + $(PLOVER_V_SKIP)$(RM) temp.png plover-applications%.pgm: plover-applications.svg - rsvg -w $* -h $* -f png $< temp.png - pngtopnm -alpha temp.png > $@ - $(RM) temp.png + $(PLOVER_V_SKIP)rsvg -w $* -h $* -f png $< temp.png + $(AM_V_GEN)pngtopnm -alpha temp.png > $@ + $(PLOVER_V_SKIP)$(RM) temp.png 24x24/plover-applications.png: plover-applications.svg - mkdir -p 24x24 - rsvg -w 24 -h 24 -f png $< $@ + $(PLOVER_V_SKIP)mkdir -p 24x24 + $(AM_V_GEN)rsvg -w 24 -h 24 -f png $< $@ 48x48/plover-applications.png: plover-applications.svg - mkdir -p 48x48 - rsvg -w 48 -h 48 -f png $< $@ + $(PLOVER_V_SKIP)mkdir -p 48x48 + $(AM_V_GEN)rsvg -w 48 -h 48 -f png $< $@ app-manager.ico: plover-applications16.pnm plover-applications16.pgm \ plover-applications22.pnm plover-applications22.pgm \ plover-applications32.pnm plover-applications32.pgm \ plover-applications46.pnm plover-applications46.pgm - ppmtowinicon -andpgms -output=$@ $^ + $(AM_V_GEN)ppmtowinicon -andpgms -output=$@ $^ clean-local: -rm -rf 24x24 48x48