From: R.E. Wolff <R.E.Wolff@BitWizard.nl>
Date: Tue, 12 Feb 2013 08:30:55 +0000 (+0100)
Subject: Use glib2 flags set by configure. Rewrite a rule so it is more portable.
X-Git-Tag: v0.84~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bc4167603698ea0170fd5f36000f0a5be7a293ef;p=thirdparty%2Fmtr.git

Use glib2 flags set by configure. Rewrite a rule so it is more portable.
---

diff --git a/Makefile.am b/Makefile.am
index c6e2f9b..4a767fa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,19 +20,20 @@ mtr_SOURCES = mtr.c \
 nodist_mtr_SOURCES = version.h
 EXTRA_mtr_SOURCES = curses.c \
                     gtk.c
+DEFAULT_INCLUDES= $(GLIB_CFLAGS) -I.
 mtr_DEPENDENCIES = $(GTK_OBJ) $(CURSES_OBJ)
-mtr_LDFLAGS = $(GTK_OBJ) $(CURSES_OBJ)
+mtr_LDFLAGS = $(GTK_OBJ) $(CURSES_OBJ) $(GLIB_LIBS)
 
 CLEANFILES = version.h
 BUILT_SOURCES = version.h
 
 version.h: version.h.tmp Makefile $(mtr_SOURCES)
-	@cat $< > $@; \
+	@cat version.h.tmp > $@; \
 	if [ -d .git ] && [ -n "$$(which git)" ]; then \
 	  xver="+git:$$(git rev-list -n1 --abbrev=8 --abbrev-commit HEAD)"; \
 	  sed \
 	    -e "/#define *MTR_VERSION */{s/\"\([^\"]*\)\"/\"\1$$xver\"/;}" \
-	    $< > $@; \
+	    version.h.tmp > $@; \
 	fi;
 
 EXTRA_DIST = SECURITY mtr.8 Makefile Makefile.dist