From 6318498ea0ba6890120b2fb6427966ed44b36bae Mon Sep 17 00:00:00 2001 From: Eddie Kohler Date: Fri, 13 Nov 2009 19:07:34 -0800 Subject: [PATCH] Tools: Correctly link with POSIX_CLOCK_LIBS when necessary. --- tools/click-align/Makefile.in | 2 +- tools/click-check/Makefile.in | 2 +- tools/click-combine/Makefile.in | 2 +- tools/click-devirtualize/Makefile.in | 2 +- tools/click-fastclassifier/Makefile.in | 2 +- tools/click-flatten/Makefile.in | 2 +- tools/click-install/Makefile.in | 2 +- tools/click-mkmindriver/Makefile.in | 2 +- tools/click-pretty/Makefile.in | 2 +- tools/click-undead/Makefile.in | 2 +- tools/click-xform/Makefile.in | 2 +- tools/click2xml/Makefile.in | 2 +- tools/lib/Makefile.in | 1 - 13 files changed, 12 insertions(+), 13 deletions(-) diff --git a/tools/click-align/Makefile.in b/tools/click-align/Makefile.in index 5cee4e7868..1d125a5e35 100644 --- a/tools/click-align/Makefile.in +++ b/tools/click-align/Makefile.in @@ -61,7 +61,7 @@ DEFS = @DEFS@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/tools/lib -I$(srcdir) LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ $(DL_LIBS) +LIBS = @LIBS@ @POSIX_CLOCK_LIBS@ $(DL_LIBS) CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $(DEPCFLAGS) CXXLD = $(CXX) diff --git a/tools/click-check/Makefile.in b/tools/click-check/Makefile.in index 9ef3bb1b32..d4e8a349b7 100644 --- a/tools/click-check/Makefile.in +++ b/tools/click-check/Makefile.in @@ -61,7 +61,7 @@ DEFS = @DEFS@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/tools/lib -I$(srcdir) LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ $(DL_LIBS) +LIBS = @LIBS@ @POSIX_CLOCK_LIBS@ $(DL_LIBS) CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $(DEPCFLAGS) CXXLD = $(CXX) diff --git a/tools/click-combine/Makefile.in b/tools/click-combine/Makefile.in index 614c103002..d80586e9bb 100644 --- a/tools/click-combine/Makefile.in +++ b/tools/click-combine/Makefile.in @@ -62,7 +62,7 @@ DEFS = @DEFS@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/tools/lib -I$(srcdir) LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ $(DL_LIBS) +LIBS = @LIBS@ @POSIX_CLOCK_LIBS@ $(DL_LIBS) CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $(DEPCFLAGS) CXXLD = $(CXX) diff --git a/tools/click-devirtualize/Makefile.in b/tools/click-devirtualize/Makefile.in index 049adc4075..7d12cc4afa 100644 --- a/tools/click-devirtualize/Makefile.in +++ b/tools/click-devirtualize/Makefile.in @@ -61,7 +61,7 @@ DEFS = @DEFS@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/tools/lib -I$(srcdir) LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ $(DL_LIBS) +LIBS = @LIBS@ @POSIX_CLOCK_LIBS@ $(DL_LIBS) CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $(DEPCFLAGS) CXXLD = $(CXX) diff --git a/tools/click-fastclassifier/Makefile.in b/tools/click-fastclassifier/Makefile.in index 91abc28441..94d839c777 100644 --- a/tools/click-fastclassifier/Makefile.in +++ b/tools/click-fastclassifier/Makefile.in @@ -61,7 +61,7 @@ DEFS = @DEFS@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/tools/lib -I$(srcdir) LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ $(DL_LIBS) +LIBS = @LIBS@ @POSIX_CLOCK_LIBS@ $(DL_LIBS) CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $(DEPCFLAGS) CXXLD = $(CXX) diff --git a/tools/click-flatten/Makefile.in b/tools/click-flatten/Makefile.in index d412ee186c..f2145ed091 100644 --- a/tools/click-flatten/Makefile.in +++ b/tools/click-flatten/Makefile.in @@ -61,7 +61,7 @@ DEFS = @DEFS@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/tools/lib -I$(srcdir) LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ $(DL_LIBS) +LIBS = @LIBS@ @POSIX_CLOCK_LIBS@ $(DL_LIBS) CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $(DEPCFLAGS) CXXLD = $(CXX) diff --git a/tools/click-install/Makefile.in b/tools/click-install/Makefile.in index 31fcd0670e..6970828085 100644 --- a/tools/click-install/Makefile.in +++ b/tools/click-install/Makefile.in @@ -62,7 +62,7 @@ DEFS = @DEFS@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/tools/lib -I$(srcdir) LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ $(DL_LIBS) +LIBS = @LIBS@ @POSIX_CLOCK_LIBS@ $(DL_LIBS) CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $(DEPCFLAGS) CXXLD = $(CXX) diff --git a/tools/click-mkmindriver/Makefile.in b/tools/click-mkmindriver/Makefile.in index 6c24064ee9..f677a58bd3 100644 --- a/tools/click-mkmindriver/Makefile.in +++ b/tools/click-mkmindriver/Makefile.in @@ -61,7 +61,7 @@ DEFS = @DEFS@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/tools/lib -I$(srcdir) LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ $(DL_LIBS) +LIBS = @LIBS@ @POSIX_CLOCK_LIBS@ $(DL_LIBS) CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $(DEPCFLAGS) CXXLD = $(CXX) diff --git a/tools/click-pretty/Makefile.in b/tools/click-pretty/Makefile.in index efa24a2d01..72c7948ae2 100644 --- a/tools/click-pretty/Makefile.in +++ b/tools/click-pretty/Makefile.in @@ -61,7 +61,7 @@ DEFS = @DEFS@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/tools/lib -I$(srcdir) LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ $(DL_LIBS) +LIBS = @LIBS@ @POSIX_CLOCK_LIBS@ $(DL_LIBS) CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $(DEPCFLAGS) CXXLD = $(CXX) diff --git a/tools/click-undead/Makefile.in b/tools/click-undead/Makefile.in index 45b40cb64c..2266122b14 100644 --- a/tools/click-undead/Makefile.in +++ b/tools/click-undead/Makefile.in @@ -61,7 +61,7 @@ DEFS = @DEFS@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/tools/lib -I$(srcdir) LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ $(DL_LIBS) +LIBS = @LIBS@ @POSIX_CLOCK_LIBS@ $(DL_LIBS) CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $(DEPCFLAGS) CXXLD = $(CXX) diff --git a/tools/click-xform/Makefile.in b/tools/click-xform/Makefile.in index 39acff7ceb..4decce55b9 100644 --- a/tools/click-xform/Makefile.in +++ b/tools/click-xform/Makefile.in @@ -61,7 +61,7 @@ DEFS = @DEFS@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/tools/lib -I$(srcdir) LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ $(DL_LIBS) +LIBS = @LIBS@ @POSIX_CLOCK_LIBS@ $(DL_LIBS) CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $(DEPCFLAGS) CXXLD = $(CXX) diff --git a/tools/click2xml/Makefile.in b/tools/click2xml/Makefile.in index 64bbf34fe1..b1a91e8b4f 100644 --- a/tools/click2xml/Makefile.in +++ b/tools/click2xml/Makefile.in @@ -62,7 +62,7 @@ DEFS = @DEFS@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/tools/lib -I$(srcdir) @EXPAT_INCLUDES@ LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ @EXPAT_LIBS@ $(DL_LIBS) +LIBS = @LIBS@ @POSIX_CLOCK_LIBS@ @EXPAT_LIBS@ $(DL_LIBS) CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $(DEPCFLAGS) CXXLD = $(CXX) diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index 2d59df15d3..225fe46890 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -85,7 +85,6 @@ DEFS = @DEFS@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(srcdir) LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ @POSIX_CLOCK_LIBS@ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $(DEPCFLAGS) COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(DEPCFLAGS)