From 800d8d1e056ddba9318fc2a8be85572587d2928c Mon Sep 17 00:00:00 2001
From: Kimmo Varis <kimmov@gmail.com>
Date: Mon, 31 Jan 2011 09:18:35 +0200
Subject: [PATCH] Cleanup makefile a bit.

Align object file lists first line. Remove excessive use of tabs.
---
 Makefile        | 16 ++++++++--------
 tools/dmake.cpp | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index de50b8d09..09aadde1c 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ MAN_SOURCE=man/cppcheck.1.xml
 
 ###### Object Files
 
-LIBOBJ =     lib/checkautovariables.o \
+LIBOBJ =      lib/checkautovariables.o \
               lib/checkbufferoverrun.o \
               lib/checkclass.o \
               lib/checkexceptionsafety.o \
@@ -46,7 +46,7 @@ LIBOBJ =     lib/checkautovariables.o \
               lib/token.o \
               lib/tokenize.o
 
-CLIOBJ =     cli/cmdlineparser.o \
+CLIOBJ =      cli/cmdlineparser.o \
               cli/cppcheckexecutor.o \
               cli/filelister.o \
               cli/filelister_unix.o \
@@ -90,7 +90,7 @@ TESTOBJ =     test/options.o \
               test/testunusedprivfunc.o \
               test/testunusedvar.o
 
-EXTOBJ =     externals/tinyxml/tinystr.o \
+EXTOBJ =      externals/tinyxml/tinystr.o \
               externals/tinyxml/tinyxml.o \
               externals/tinyxml/tinyxmlerror.o \
               externals/tinyxml/tinyxmlparser.o
@@ -98,13 +98,13 @@ EXTOBJ =     externals/tinyxml/tinystr.o \
 
 ###### Targets
 
-cppcheck:	$(LIBOBJ)	$(CLIOBJ)	$(EXTOBJ)
+cppcheck: $(LIBOBJ) $(CLIOBJ) $(EXTOBJ)
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o cppcheck $(CLIOBJ) $(LIBOBJ) $(EXTOBJ) -lpcre $(LDFLAGS)
 
-all:	cppcheck	testrunner
+all:	cppcheck testrunner
 
-testrunner:	$(TESTOBJ)	$(LIBOBJ)	$(EXTOBJ)	cli/threadexecutor.o	cli/cmdlineparser.o	cli/cppcheckexecutor.o	cli/filelister.o	cli/filelister_unix.o
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o testrunner $(TESTOBJ) $(LIBOBJ) $(EXTOBJ) -lpcre cli/threadexecutor.o cli/cmdlineparser.o	cli/filelister.o	cli/filelister_unix.o $(LDFLAGS)
+testrunner: $(TESTOBJ) $(LIBOBJ) $(EXTOBJ) cli/threadexecutor.o cli/cmdlineparser.o cli/cppcheckexecutor.o cli/filelister.o cli/filelister_unix.o
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o testrunner $(TESTOBJ) $(LIBOBJ) $(EXTOBJ) -lpcre cli/threadexecutor.o cli/cmdlineparser.o cli/filelister.o cli/filelister_unix.o $(LDFLAGS)
 
 test:	all
 	./testrunner
@@ -127,7 +127,7 @@ man/cppcheck.1:	$(MAN_SOURCE)
 tags:
 	ctags -R --exclude=doxyoutput .
 
-install:	cppcheck
+install: cppcheck
 	install -d ${BIN}
 	install cppcheck ${BIN}
 
diff --git a/tools/dmake.cpp b/tools/dmake.cpp
index 0ff33c099..434a4128c 100644
--- a/tools/dmake.cpp
+++ b/tools/dmake.cpp
@@ -208,11 +208,11 @@ int main(int argc, char **argv)
     fout << "MAN_SOURCE=man/cppcheck.1.xml\n\n";
 
     fout << "\n###### Object Files\n\n";
-    fout << "LIBOBJ =     " << objfile(libfiles[0]);
+    fout << "LIBOBJ =      " << objfile(libfiles[0]);
     for (unsigned int i = 1; i < libfiles.size(); ++i)
         fout << " \\" << std::endl << std::string(14, ' ') << objfile(libfiles[i]);
     fout << "\n\n";
-    fout << "CLIOBJ =     " << objfile(clifiles[0]);
+    fout << "CLIOBJ =      " << objfile(clifiles[0]);
     for (unsigned int i = 1; i < clifiles.size(); ++i)
         fout << " \\" << std::endl << std::string(14, ' ') << objfile(clifiles[i]);
     fout << "\n\n";
@@ -220,18 +220,18 @@ int main(int argc, char **argv)
     for (unsigned int i = 1; i < testfiles.size(); ++i)
         fout << " \\" << std::endl << std::string(14, ' ') << objfile(testfiles[i]);
     fout << "\n\n";
-    fout << "EXTOBJ =     " << objfile(externalfiles[0]);
+    fout << "EXTOBJ =      " << objfile(externalfiles[0]);
     for (unsigned int i = 1; i < externalfiles.size(); ++i)
         fout << " \\" << std::endl << std::string(14, ' ') << objfile(externalfiles[i]);
     fout << "\n\n";
 
 
     fout << "\n###### Targets\n\n";
-    fout << "cppcheck:\t$(LIBOBJ)\t$(CLIOBJ)\t$(EXTOBJ)\n";
+    fout << "cppcheck: $(LIBOBJ) $(CLIOBJ) $(EXTOBJ)\n";
     fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o cppcheck $(CLIOBJ) $(LIBOBJ) $(EXTOBJ) -lpcre $(LDFLAGS)\n\n";
-    fout << "all:\tcppcheck\ttestrunner\n\n";
-    fout << "testrunner:\t$(TESTOBJ)\t$(LIBOBJ)\t$(EXTOBJ)\tcli/threadexecutor.o\tcli/cmdlineparser.o\tcli/cppcheckexecutor.o\tcli/filelister.o\tcli/filelister_unix.o\n";
-    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o testrunner $(TESTOBJ) $(LIBOBJ) $(EXTOBJ) -lpcre cli/threadexecutor.o cli/cmdlineparser.o\tcli/filelister.o\tcli/filelister_unix.o $(LDFLAGS)\n\n";
+    fout << "all:\tcppcheck testrunner\n\n";
+    fout << "testrunner: $(TESTOBJ) $(LIBOBJ) $(EXTOBJ) cli/threadexecutor.o cli/cmdlineparser.o cli/cppcheckexecutor.o cli/filelister.o cli/filelister_unix.o\n";
+    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o testrunner $(TESTOBJ) $(LIBOBJ) $(EXTOBJ) -lpcre cli/threadexecutor.o cli/cmdlineparser.o cli/filelister.o cli/filelister_unix.o $(LDFLAGS)\n\n";
     fout << "test:\tall\n";
     fout << "\t./testrunner\n\n";
     fout << "check:\tall\n";
@@ -248,7 +248,7 @@ int main(int argc, char **argv)
     fout << "\t$(XP) $(DB2MAN) $(MAN_SOURCE)\n\n";
     fout << "tags:\n";
     fout << "\tctags -R --exclude=doxyoutput .\n\n";
-    fout << "install:\tcppcheck\n";
+    fout << "install: cppcheck\n";
     fout << "\tinstall -d ${BIN}\n";
     fout << "\tinstall cppcheck ${BIN}\n\n";
 #endif