From 15e66a5b19eb533680d280366e9a73407e23e472 Mon Sep 17 00:00:00 2001
From: Amaury Pouly <amaury.pouly@gmail.com>
Date: Tue, 25 Apr 2017 11:21:54 +1000
Subject: nwztools: small cleanups

Change-Id: I4fde020ca0556a84d051f9b5e46f49ee1241266e
---
 utils/nwztools/database/nvp/Makefile    | 6 +++---
 utils/nwztools/database/nvp/nvptool.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'utils')

diff --git a/utils/nwztools/database/nvp/Makefile b/utils/nwztools/database/nvp/Makefile
index 0838912b80..3f0da6a931 100644
--- a/utils/nwztools/database/nvp/Makefile
+++ b/utils/nwztools/database/nvp/Makefile
@@ -3,9 +3,9 @@ CC=gcc
 CXX=g++
 LD=g++
 PROFILE=
-CFLAGS=-g $(PROFILE) -std=c99 -Wall $(DEFINES) `xml2-config --cflags`
-CXXFLAGS=-g $(PROFILE) -Wall $(DEFINES) `xml2-config --cflags`
-LDFLAGS=$(PROFILE) `xml2-config --libs`
+CFLAGS=-g $(PROFILE) -std=c99 -Wall $(DEFINES)
+CXXFLAGS=-g $(PROFILE) -Wall $(DEFINES)
+LDFLAGS=$(PROFILE)
 BINS=nvptool
 
 all: $(BINS)
diff --git a/utils/nwztools/database/nvp/nvptool.cpp b/utils/nwztools/database/nvp/nvptool.cpp
index 1371e93b87..8c09d1bea0 100644
--- a/utils/nwztools/database/nvp/nvptool.cpp
+++ b/utils/nwztools/database/nvp/nvptool.cpp
@@ -616,7 +616,7 @@ int do_extract(const char *output, int argc, char **argv)
             continue;
         }
         /* relocate the zoneinfo pointer */
-        void *Zone = elf_reloc_addr32_ptr(zoneinfo_ptr);;
+        void *Zone = elf_reloc_addr32_ptr(zoneinfo_ptr);
         if(Zone == nullptr)
         {
             printf("  %s\n", name);
-- 
cgit v1.2.3