[checkmk-commits] windows agent: re-fixed the makefile

Module: check_mk Branch: master Commit: 0ff781254a3728a58360b2aab59dcd4a1f2081b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ff781254a3728… Author: Sebastian Herbord &lt;sh(a)mathias-kettner.de&gt; Date: Thu Jun 30 14:39:06 2016 +0200 windows agent: re-fixed the makefile --- agents/windows/Makefile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 8e86cd8..a145938 100644 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -123,10 +123,10 @@ check_mk_agent-64.unstripped.exe: $(OBJS64) $(CXX_64) $(COPTIONS) -o $@ $^ check_mk_agent-64.res -lwsock32 -lws2_32 -lole32 -loleaut32 -lwbemuuid -lpsapi -lshlwapi -limagehlp -check_mk_agent.unversioned.exe: +check_mk_agent.unversioned.exe: check_mk_agent.unstripped.exe strip -o $@ $^ -check_mk_agent-64.unversioned.exe: +check_mk_agent-64.unversioned.exe: check_mk_agent-64.unstripped.exe strip -o $@ $^ @@ -135,16 +135,18 @@ check_mk_agent-64.unversioned.exe: # recompilation is thus needed during 'make version' # ----------------------------------------------------------------------------- -check_mk_agent.exe.versioned: check_mk_agent.unversioned.exe +check_mk_agent.exe.versioned: ./bin_replace $(VERSION_DUMMY) "$(VERSION)" < check_mk_agent.unversioned.exe > check_mk_agent.exe chmod 755 check_mk_agent.exe -check_mk_agent-64.exe.versioned: check_mk_agent-64.unversioned.exe +check_mk_agent-64.exe.versioned: ./bin_replace $(VERSION_DUMMY) "$(VERSION)" < check_mk_agent-64.unversioned.exe > check_mk_agent-64.exe chmod 755 check_mk_agent-64.exe - -%.exe: %.exe.versioned +# important: %.exe.versioned must not depend on %.exe.unversioned because on the +# automated build system, "make ...versioned" is called and that system doesn't +# provide the right compiler to build this agent +%.exe: %.exe.unversioned %.exe.versioned true # -----------------------------------------------------------------------------