tools: build the SVG tools unconditionally, and clean up the Makefile a bit

This commit is contained in:
Michael Natterer
2016-07-21 12:20:14 +02:00
parent 4a3b56c5ac
commit 84439a8748
2 changed files with 26 additions and 20 deletions

6
tools/.gitignore vendored
View File

@ -5,5 +5,9 @@
/kernelgen /kernelgen
/gimptool-2.0 /gimptool-2.0
/gimptool-2.0.exe /gimptool-2.0.exe
/test-clipboard
/test-clipboard.exe /test-clipboard.exe
/test-clipboard.exe
/invert-svg
/invert-svg.exe
/compute-svg-viewbox
/compute-svg-viewbox.exe

View File

@ -3,12 +3,10 @@
libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
if WITH_PDBGEN if WITH_PDBGEN
D_pdbgen = pdbgen PDBGEN = pdbgen
else
D_pdbgen =
endif endif
SUBDIRS = $(D_pdbgen) SUBDIRS = $(PDBEN)
if OS_WIN32 if OS_WIN32
@ -24,39 +22,43 @@ bin_PROGRAMS = gimptool-2.0
endif endif
noinst_PROGRAMS = test-clipboard noinst_PROGRAMS = \
test-clipboard \
invert-svg \
compute-svg-viewbox
EXTRA_PROGRAMS = \ EXTRA_PROGRAMS = \
kernelgen kernelgen
gimptool_2_0_SOURCES = \
gimptool.c gimptool_2_0_SOURCES = gimptool.c
gimptool_2_0_LDADD = \ gimptool_2_0_LDADD = \
$(libgimpbase) \ $(libgimpbase) \
$(GTK_LIBS) $(GTK_LIBS)
kernelgen_SOURCES = kernelgen.c kernelgen_SOURCES = kernelgen.c
test_clipboard_SOURCES = test-clipboard.c test_clipboard_SOURCES = test-clipboard.c
test_clipboard_LDADD = \ test_clipboard_LDADD = $(GTK_LIBS)
$(GTK_LIBS)
invert_svg_SOURCES = invert-svg.c
invert_svg_CFLAGS = $(SVG_CFLAGS)
invert_svg_LDADD = $(SVG_LIBS)
if ENABLE_VECTOR_ICONS
invert-svg$(BUILD_EXEEXT): invert-svg.c
$(CC_FOR_BUILD) -o $@ $< $(NATIVE_GLIB_LIBS) $(NATIVE_GLIB_CFLAGS)
compute_svg_viewbox_SOURCES = compute-svg-viewbox.c compute_svg_viewbox_SOURCES = compute-svg-viewbox.c
compute_svg_viewbox_CFLAGS = \ compute_svg_viewbox_CFLAGS = $(SVG_CFLAGS)
$(SVG_CFLAGS)
compute_svg_viewbox_LDADD = \ compute_svg_viewbox_LDADD = $(SVG_LIBS)
$(SVG_LIBS)
all: invert-svg$(BUILD_EXEEXT)
endif
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-DGIMP_APP_VERSION=\"@GIMP_APP_VERSION@\" \ -DGIMP_APP_VERSION=\"@GIMP_APP_VERSION@\" \