Autotools cleanup

2016-12-12 20:22:49 +01:00 · 2016-12-12 20:22:49 +01:00 · 4c86ed319b
parent f28967e74f
commit 4c86ed319b
33 changed files with 39 additions and 92 deletions
--- a/Ntp.Analyzer.Cli/Makefile
+++ b/Ntp.Analyzer.Cli/Makefile
@ -143,7 +143,7 @@ NTP_ANALYZER_MONITOR_CLIENT_DLL = $(BUILD_DIR)/Ntp.Analyzer.Monitor.Client.dll
 NTP_ANALYZER_MONITOR_SERVER_DLL = $(BUILD_DIR)/Ntp.Analyzer.Monitor.Server.dll
 NTPA = $(BUILD_DIR)/Ntp.Analyzer.Cli.exe

-FILES = \
+FILES =  \
 	../Shared/AssemblyInfo.cs \
 	Program.cs 

@ -151,10 +151,12 @@ DATA_FILES =

 RESOURCES = 

-EXTRAS = \
-	ntpa.in 
+EXTRAS = 

 REFERENCES =  \
+	../bin/Ntp.Analyzer.dll \
+	../bin/Ntp.Analyzer.Process.dll \
+	../bin/Ntp.Common.dll \
 	System

 DLL_REFERENCES = 
@ -171,7 +173,7 @@ include $(top_srcdir)/Makefile.include

 $(eval $(call emit-deploy-target,MYSQL_DATA_DLL))
 $(eval $(call emit-deploy-target,NPGSQL_DLL))
-$(eval $(call emit-deploy-wrapper,NTPA,ntpa,x))
+$(eval $(call emit-deploy-wrapper,NTPA))


 $(eval $(call emit_resgen_targets))
@ -183,9 +185,7 @@ $(ASSEMBLY_MDB): $(ASSEMBLY)
 $(ASSEMBLY): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list) $(build_satellite_assembly_list)
 	make pre-all-local-hook prefix=$(prefix)
 	mkdir -p $(shell dirname $(ASSEMBLY))
-	make $(CONFIG)_BeforeBuild
 	$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
-	make $(CONFIG)_AfterBuild
 	make post-all-local-hook prefix=$(prefix)

 install-local: $(ASSEMBLY) $(ASSEMBLY_MDB)
--- a/Ntp.Analyzer.Cli/Makefile.am
+++ b/Ntp.Analyzer.Cli/Makefile.am
@ -134,8 +134,7 @@ DATA_FILES =

 RESOURCES = 

-EXTRAS = \
-	ntpa.in 
+EXTRAS = 

 REFERENCES =  \
 	System
@ -162,7 +161,7 @@ NTPA = $(BUILD_DIR)/Ntp.Analyzer.Cli.exe

 $(eval $(call emit-deploy-target,MYSQL_DATA_DLL))
 $(eval $(call emit-deploy-target,NPGSQL_DLL))
-$(eval $(call emit-deploy-target,NTPA,x))
+$(eval $(call emit-deploy-wrapper,NTPA))


 $(eval $(call emit_resgen_targets))
--- a/Ntp.Analyzer.Cli/Ntp.Analyzer.Cli.csproj
+++ b/Ntp.Analyzer.Cli/Ntp.Analyzer.Cli.csproj
@ -57,7 +57,16 @@
  <ProjectExtensions>
    <MonoDevelop>
      <Properties>
-        <Deployment.LinuxDeployData scriptName="ntpa" />
+        <Deployment.LinuxDeployData generateScript="False" />
+        <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile" SyncReferences="True">
+          <BuildFilesVar Sync="True" Name="FILES" />
+          <DeployFilesVar />
+          <ResourcesVar Name="RESOURCES" />
+          <OthersVar />
+          <GacRefVar Sync="True" Name="REFERENCES" />
+          <AsmRefVar Sync="True" Name="REFERENCES" />
+          <ProjectRefVar Sync="True" Name="REFERENCES" />
+        </MonoDevelop.Autotools.MakefileInfo>
      </Properties>
    </MonoDevelop>
  </ProjectExtensions>
--- a/Ntp.Analyzer.Cli/ntpa
+++ b/Ntp.Analyzer.Cli/ntpa
@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono "/usr/local/lib/ntp.analyzer/Ntp.Analyzer.Cli.exe" "$@"
--- a/Ntp.Analyzer.Cli/ntpa.in
+++ b/Ntp.Analyzer.Cli/ntpa.in
@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono "@expanded_libdir@/@PACKAGE@/Ntp.Analyzer.Cli.exe" "$@"
--- a/Ntp.Analyzer.Data/Makefile
+++ b/Ntp.Analyzer.Data/Makefile
@ -157,9 +157,7 @@ $(ASSEMBLY_MDB): $(ASSEMBLY)
 $(ASSEMBLY): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list) $(build_satellite_assembly_list)
 	make pre-all-local-hook prefix=$(prefix)
 	mkdir -p $(shell dirname $(ASSEMBLY))
-	make $(CONFIG)_BeforeBuild
 	$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
-	make $(CONFIG)_AfterBuild
 	make post-all-local-hook prefix=$(prefix)

 install-local: $(ASSEMBLY) $(ASSEMBLY_MDB)
--- a/Ntp.Analyzer.Import/Makefile
+++ b/Ntp.Analyzer.Import/Makefile
@ -155,9 +155,7 @@ $(ASSEMBLY_MDB): $(ASSEMBLY)
 $(ASSEMBLY): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list) $(build_satellite_assembly_list)
 	make pre-all-local-hook prefix=$(prefix)
 	mkdir -p $(shell dirname $(ASSEMBLY))
-	make $(CONFIG)_BeforeBuild
 	$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
-	make $(CONFIG)_AfterBuild
 	make post-all-local-hook prefix=$(prefix)

 install-local: $(ASSEMBLY) $(ASSEMBLY_MDB)
--- a/Ntp.Analyzer.Monitor.Cli/Makefile
+++ b/Ntp.Analyzer.Monitor.Cli/Makefile
@ -77,8 +77,7 @@ DATA_FILES =

 RESOURCES = 

-EXTRAS = \
-	ntpac.in 
+EXTRAS = 

 REFERENCES =  \
 	../bin/Ntp.Analyzer.Monitor.Client.dll \
@ -97,7 +96,7 @@ include $(top_srcdir)/Makefile.include



-$(eval $(call emit-deploy-wrapper,NTPAC,ntpac,x))
+$(eval $(call emit-deploy-wrapper,NTPAC))


 $(eval $(call emit_resgen_targets))
@ -109,9 +108,7 @@ $(ASSEMBLY_MDB): $(ASSEMBLY)
 $(ASSEMBLY): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list) $(build_satellite_assembly_list)
 	make pre-all-local-hook prefix=$(prefix)
 	mkdir -p $(shell dirname $(ASSEMBLY))
-	make $(CONFIG)_BeforeBuild
 	$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
-	make $(CONFIG)_AfterBuild
 	make post-all-local-hook prefix=$(prefix)

 install-local: $(ASSEMBLY) $(ASSEMBLY_MDB)
--- a/Ntp.Analyzer.Monitor.Cli/Makefile.am
+++ b/Ntp.Analyzer.Monitor.Cli/Makefile.am
@ -70,8 +70,7 @@ DATA_FILES =

 RESOURCES = 

-EXTRAS = \
-	ntpac.in 
+EXTRAS = 

 REFERENCES =  \
 	System
@ -86,8 +85,7 @@ NTP_ANALYZER_MONITOR_CLIENT_DLL = $(BUILD_DIR)/Ntp.Analyzer.Monitor.Client.dll
 NTP_COMMON_DLL = $(BUILD_DIR)/Ntp.Common.dll
 NTPAC = $(BUILD_DIR)/Ntp.Analyzer.Monitor.Cli.exe

-$(eval $(call emit-deploy-wrapper,NTPAC,ntpac,x))
-
+$(eval $(call emit-deploy-wrapper,NTPAC))

 $(eval $(call emit_resgen_targets))
 $(build_xamlg_list): %.xaml.g.cs: %.xaml
--- a/Ntp.Analyzer.Monitor.Cli/Ntp.Analyzer.Monitor.Cli.csproj
+++ b/Ntp.Analyzer.Monitor.Cli/Ntp.Analyzer.Monitor.Cli.csproj
@ -55,11 +55,11 @@
  <ProjectExtensions>
    <MonoDevelop>
      <Properties>
-        <Deployment.LinuxDeployData scriptName="ntpac" />
+        <Deployment.LinuxDeployData generateScript="False" />
        <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile" SyncReferences="True">
          <BuildFilesVar Sync="True" Name="FILES" />
          <DeployFilesVar />
-          <ResourcesVar Sync="True" Name="RESOURCES" />
+          <ResourcesVar />
          <OthersVar />
          <GacRefVar Sync="True" Name="REFERENCES" />
          <AsmRefVar Sync="True" Name="REFERENCES" />
--- a/Ntp.Analyzer.Monitor.Cli/ntpac
+++ b/Ntp.Analyzer.Monitor.Cli/ntpac
@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono "/usr/local/lib/ntp.analyzer/Ntp.Analyzer.Monitor.Cli.exe" "$@"
--- a/Ntp.Analyzer.Monitor.Cli/ntpac.in
+++ b/Ntp.Analyzer.Monitor.Cli/ntpac.in
@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono "@expanded_libdir@/@PACKAGE@/Ntp.Analyzer.Monitor.Cli.exe" "$@"
--- a/Ntp.Analyzer.Monitor.Client/Makefile
+++ b/Ntp.Analyzer.Monitor.Client/Makefile
@ -94,9 +94,7 @@ $(ASSEMBLY_MDB): $(ASSEMBLY)
 $(ASSEMBLY): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list) $(build_satellite_assembly_list)
 	make pre-all-local-hook prefix=$(prefix)
 	mkdir -p $(shell dirname $(ASSEMBLY))
-	make $(CONFIG)_BeforeBuild
 	$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
-	make $(CONFIG)_AfterBuild
 	make post-all-local-hook prefix=$(prefix)

 install-local: $(ASSEMBLY) $(ASSEMBLY_MDB)
--- a/Ntp.Analyzer.Monitor.Server/Makefile
+++ b/Ntp.Analyzer.Monitor.Server/Makefile
@ -185,9 +185,7 @@ $(ASSEMBLY_MDB): $(ASSEMBLY)
 $(ASSEMBLY): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list) $(build_satellite_assembly_list)
 	make pre-all-local-hook prefix=$(prefix)
 	mkdir -p $(shell dirname $(ASSEMBLY))
-	make $(CONFIG)_BeforeBuild
 	$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
-	make $(CONFIG)_AfterBuild
 	make post-all-local-hook prefix=$(prefix)

 install-local: $(ASSEMBLY) $(ASSEMBLY_MDB)
--- a/Ntp.Analyzer.Objects/Makefile
+++ b/Ntp.Analyzer.Objects/Makefile
@ -96,9 +96,7 @@ $(ASSEMBLY_MDB): $(ASSEMBLY)
 $(ASSEMBLY): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list) $(build_satellite_assembly_list)
 	make pre-all-local-hook prefix=$(prefix)
 	mkdir -p $(shell dirname $(ASSEMBLY))
-	make $(CONFIG)_BeforeBuild
 	$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
-	make $(CONFIG)_AfterBuild
 	make post-all-local-hook prefix=$(prefix)

 install-local: $(ASSEMBLY) $(ASSEMBLY_MDB)
--- a/Ntp.Analyzer.Process/Makefile
+++ b/Ntp.Analyzer.Process/Makefile
@ -209,9 +209,7 @@ $(ASSEMBLY_MDB): $(ASSEMBLY)
 $(ASSEMBLY): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list) $(build_satellite_assembly_list)
 	make pre-all-local-hook prefix=$(prefix)
 	mkdir -p $(shell dirname $(ASSEMBLY))
-	make $(CONFIG)_BeforeBuild
 	$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
-	make $(CONFIG)_AfterBuild
 	make post-all-local-hook prefix=$(prefix)

 install-local: $(ASSEMBLY) $(ASSEMBLY_MDB)
--- a/Ntp.Analyzer.Validate.Cli/Makefile
+++ b/Ntp.Analyzer.Validate.Cli/Makefile
@ -125,8 +125,7 @@ DATA_FILES =

 RESOURCES = 

-EXTRAS = \
-	ntpav.in 
+EXTRAS = 

 REFERENCES =  \
 	../bin/Ntp.Analyzer.dll \
@ -147,7 +146,7 @@ include $(top_srcdir)/Makefile.include

 $(eval $(call emit-deploy-target,MYSQL_DATA_DLL))
 $(eval $(call emit-deploy-target,NPGSQL_DLL))
-$(eval $(call emit-deploy-wrapper,NTPAV,ntpav,x))
+$(eval $(call emit-deploy-wrapper,NTPAV))


 $(eval $(call emit_resgen_targets))
@ -159,9 +158,7 @@ $(ASSEMBLY_MDB): $(ASSEMBLY)
 $(ASSEMBLY): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list) $(build_satellite_assembly_list)
 	make pre-all-local-hook prefix=$(prefix)
 	mkdir -p $(shell dirname $(ASSEMBLY))
-	make $(CONFIG)_BeforeBuild
 	$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
-	make $(CONFIG)_AfterBuild
 	make post-all-local-hook prefix=$(prefix)

 install-local: $(ASSEMBLY) $(ASSEMBLY_MDB)
--- a/Ntp.Analyzer.Validate.Cli/Makefile.am
+++ b/Ntp.Analyzer.Validate.Cli/Makefile.am
@ -111,8 +111,7 @@ DATA_FILES =

 RESOURCES = 

-EXTRAS = \
-	ntpav.in 
+EXTRAS = 

 REFERENCES =  \
 	System
@ -136,7 +135,7 @@ NTPAV = $(BUILD_DIR)/Ntp.Analyzer.Validate.Cli.exe

 $(eval $(call emit-deploy-target,MYSQL_DATA_DLL))
 $(eval $(call emit-deploy-target,NPGSQL_DLL))
-$(eval $(call emit-deploy-wrapper,NTPAV,ntpav,x))
+$(eval $(call emit-deploy-wrapper,NTPAV))


 $(eval $(call emit_resgen_targets))
--- a/Ntp.Analyzer.Validate.Cli/Ntp.Analyzer.Validate.Cli.csproj
+++ b/Ntp.Analyzer.Validate.Cli/Ntp.Analyzer.Validate.Cli.csproj
@ -53,7 +53,7 @@
  <ProjectExtensions>
    <MonoDevelop>
      <Properties>
-        <Deployment.LinuxDeployData scriptName="ntpav" />
+        <Deployment.LinuxDeployData generateScript="False" />
        <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile" SyncReferences="True">
          <BuildFilesVar Sync="True" Name="FILES" />
          <DeployFilesVar />
--- a/Ntp.Analyzer.Validate.Cli/ntpav
+++ b/Ntp.Analyzer.Validate.Cli/ntpav
@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono "/usr/local/lib/ntp.analyzer/Ntp.Analyzer.Validate.Cli.exe" "$@"
--- a/Ntp.Analyzer.Validate.Cli/ntpav.in
+++ b/Ntp.Analyzer.Validate.Cli/ntpav.in
@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono "@expanded_libdir@/@PACKAGE@/Ntp.Analyzer.Validate.Cli.exe" "$@"
--- a/Ntp.Analyzer.Validate.Gui/Makefile
+++ b/Ntp.Analyzer.Validate.Gui/Makefile
@ -125,8 +125,7 @@ DATA_FILES =

 RESOURCES = 

-EXTRAS = \
-	ntpag.in 
+EXTRAS = 

 REFERENCES =  \
 	../bin/Ntp.Analyzer.dll \
@ -149,7 +148,7 @@ include $(top_srcdir)/Makefile.include

 $(eval $(call emit-deploy-target,MYSQL_DATA_DLL))
 $(eval $(call emit-deploy-target,NPGSQL_DLL))
-$(eval $(call emit-deploy-wrapper,NTPAG,ntpag,x))
+$(eval $(call emit-deploy-wrapper,NTPAG))


 $(eval $(call emit_resgen_targets))
@ -161,9 +160,7 @@ $(ASSEMBLY_MDB): $(ASSEMBLY)
 $(ASSEMBLY): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list) $(build_satellite_assembly_list)
 	make pre-all-local-hook prefix=$(prefix)
 	mkdir -p $(shell dirname $(ASSEMBLY))
-	make $(CONFIG)_BeforeBuild
 	$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
-	make $(CONFIG)_AfterBuild
 	make post-all-local-hook prefix=$(prefix)

 install-local: $(ASSEMBLY) $(ASSEMBLY_MDB)
--- a/Ntp.Analyzer.Validate.Gui/Makefile.am
+++ b/Ntp.Analyzer.Validate.Gui/Makefile.am
@ -111,8 +111,7 @@ DATA_FILES =

 RESOURCES = 

-EXTRAS = \
-	ntpag.in 
+EXTRAS = 

 REFERENCES =  \
 	System \
@ -139,7 +138,7 @@ NTPAG = $(BUILD_DIR)/Ntp.Analyzer.Validate.Gui.exe

 $(eval $(call emit-deploy-target,MYSQL_DATA_DLL))
 $(eval $(call emit-deploy-target,NPGSQL_DLL))
-$(eval $(call emit-deploy-wrapper,NTPAG,ntpag,x))
+$(eval $(call emit-deploy-wrapper,NTPAG))


 $(eval $(call emit_resgen_targets))
--- a/Ntp.Analyzer.Validate.Gui/Ntp.Analyzer.Validate.Gui.csproj
+++ b/Ntp.Analyzer.Validate.Gui/Ntp.Analyzer.Validate.Gui.csproj
@ -57,7 +57,7 @@
  <ProjectExtensions>
    <MonoDevelop>
      <Properties>
-        <Deployment.LinuxDeployData scriptName="ntpag" />
+        <Deployment.LinuxDeployData generateScript="False" />
        <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile" SyncReferences="True">
          <BuildFilesVar Sync="True" Name="FILES" />
          <DeployFilesVar />
--- a/Ntp.Analyzer.Validate.Gui/ntpag
+++ b/Ntp.Analyzer.Validate.Gui/ntpag
@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono "/usr/local/lib/ntp.analyzer/Ntp.Analyzer.Validate.Gui.exe" "$@"
--- a/Ntp.Analyzer.Validate.Gui/ntpag.in
+++ b/Ntp.Analyzer.Validate.Gui/ntpag.in
@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono "@expanded_libdir@/@PACKAGE@/Ntp.Analyzer.Validate.Gui.exe" "$@"
--- a/Ntp.Analyzer/Makefile
+++ b/Ntp.Analyzer/Makefile
@ -327,9 +327,7 @@ $(ASSEMBLY_MDB): $(ASSEMBLY)
 $(ASSEMBLY): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list) $(build_satellite_assembly_list)
 	make pre-all-local-hook prefix=$(prefix)
 	mkdir -p $(shell dirname $(ASSEMBLY))
-	make $(CONFIG)_BeforeBuild
 	$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
-	make $(CONFIG)_AfterBuild
 	make post-all-local-hook prefix=$(prefix)

 install-local: $(ASSEMBLY) $(ASSEMBLY_MDB)
--- a/Ntp.Common/Makefile
+++ b/Ntp.Common/Makefile
@ -117,9 +117,7 @@ $(ASSEMBLY_MDB): $(ASSEMBLY)
 $(ASSEMBLY): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list) $(build_satellite_assembly_list)
 	make pre-all-local-hook prefix=$(prefix)
 	mkdir -p $(shell dirname $(ASSEMBLY))
-	make $(CONFIG)_BeforeBuild
 	$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
-	make $(CONFIG)_AfterBuild
 	make post-all-local-hook prefix=$(prefix)

 install-local: $(ASSEMBLY) $(ASSEMBLY_MDB)
--- a/Ntp.Data.Provider/Makefile
+++ b/Ntp.Data.Provider/Makefile
@ -115,9 +115,7 @@ $(ASSEMBLY_MDB): $(ASSEMBLY)
 $(ASSEMBLY): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list) $(build_satellite_assembly_list)
 	make pre-all-local-hook prefix=$(prefix)
 	mkdir -p $(shell dirname $(ASSEMBLY))
-	make $(CONFIG)_BeforeBuild
 	$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
-	make $(CONFIG)_AfterBuild
 	make post-all-local-hook prefix=$(prefix)

 install-local: $(ASSEMBLY) $(ASSEMBLY_MDB)
--- a/Ntp.Data.Provider/Makefile.am
+++ b/Ntp.Data.Provider/Makefile.am
@ -81,8 +81,8 @@ REFERENCES =  \
 	System.Data

 DLL_REFERENCES =  \
-	$(MYSQL_DATA_DLL_SOURCE) \
-	$(NPGSQL_DLL_SOURCE)
+       $(MYSQL_DATA_DLL_SOURCE) \
+       $(NPGSQL_DLL_SOURCE)

 CLEANFILES = $(PROGRAMFILES) 

--- a/Ntp.Data/Makefile
+++ b/Ntp.Data/Makefile
@ -104,9 +104,7 @@ $(ASSEMBLY_MDB): $(ASSEMBLY)
 $(ASSEMBLY): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list) $(build_satellite_assembly_list)
 	make pre-all-local-hook prefix=$(prefix)
 	mkdir -p $(shell dirname $(ASSEMBLY))
-	make $(CONFIG)_BeforeBuild
 	$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
-	make $(CONFIG)_AfterBuild
 	make post-all-local-hook prefix=$(prefix)

 install-local: $(ASSEMBLY) $(ASSEMBLY_MDB)
--- a/autogen.sh
+++ b/autogen.sh
@ -1,6 +1,6 @@
 #! /bin/sh

-PROJECT=Ntp.Analyzer
+PROJECT=ntpa
 FILE=
 CONFIGURE=configure.ac

--- a/configure.ac
+++ b/configure.ac
@ -17,8 +17,8 @@ SHAMROCK_EXPAND_DATADIR

 AC_PROG_INSTALL

-AC_PATH_PROG(mcs, mcs, no)
-if test "x$mcs" = "xno"; then
+AC_PATH_PROG(MCS, mcs, no)
+if test "x$MCS" = "xno"; then
        AC_MSG_ERROR([mcs Not found])
 fi

@ -57,18 +57,14 @@ Ntp.Common/Makefile
 Ntp.Analyzer.Monitor.Client/Makefile
 Ntp.Data/Makefile
 Ntp.Data.Provider/Makefile
-Ntp.Analyzer.Monitor.Cli/ntpac
 Ntp.Analyzer.Monitor.Cli/Makefile
 Ntp.Analyzer.Data/Makefile
 Ntp.Analyzer.Import/Makefile
 Ntp.Analyzer/Makefile
-Ntp.Analyzer.Validate.Cli/ntpav
 Ntp.Analyzer.Validate.Cli/Makefile
-Ntp.Analyzer.Validate.Gui/ntpag
 Ntp.Analyzer.Validate.Gui/Makefile
 Ntp.Analyzer.Monitor.Server/Makefile
 Ntp.Analyzer.Process/Makefile
-Ntp.Analyzer.Cli/ntpa
 Ntp.Analyzer.Cli/Makefile
 Makefile