[chronojump] Simplify chronojump server

[Andoni Morales Alastruey <amorales src gnome org>]

commit 8f31b755fc86f4d4399755cd085fcd29c4d82d73
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date:   Mon Oct 14 13:33:44 2013 +0200

    Simplify chronojump server

 build/build.environment.mk    |   10 +++++++-
 chronojump_server/Makefile.am |   54 +++++-----------------------------------
 src/Makefile.am               |    1 -
 3 files changed, 16 insertions(+), 49 deletions(-)
---
diff --git a/build/build.environment.mk b/build/build.environment.mk
index 9ee798b..7c52168 100644
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -9,13 +9,16 @@ DEFAULT_INSTALL_DIR = $(pkglibdir)
 LINK_SYSTEM = -r:System
 LINK_SYSTEM_CORE = -r:System.Core
 LINK_SYSTEM_DATA_DATASETEXTENSTIONS = -r:System.Data.DataSetExtensions
+LINK_SYSTEMDATA = -r:System.Data
 LINK_SYSTEM_DRAWING = -r:System.Drawing
 LINK_SYSTEM_NUMERICS = -r:System.Numerics
 LINK_SYSTEM_XML = -r:System.Xml
 LINK_SYSTEM_XML_LINQ = -r:System.Xml.Linq
+LINK_SYSTEM_WEB_SERVICES = -r:System.Web.Services
 LINK_MICROSOFT_CSHARP = -r:Microsoft.CSharp
 LINK_CAIRO = -r:Mono.Cairo
 LINK_MONO_POSIX = -r:Mono.Posix
+LINK_MONO_DATA_SQLITE = -r:Mono.Data.Sqlite
 LINK_GLIB = $(GLIB_SHARP_20_LIBS)
 LINK_GTK = $(GTK_SHARP_20_LIBS)
 LINK_RDOTNET = -r:$(DIR_BIN)/RDotNet.dll
@@ -38,7 +41,6 @@ REF_DEP_RDOTNET_NATIVE = \
 REF_DEP_RDOTNET = \
        $(LINK_SYSTEM) \
        $(LINK_SYSTEM_CORE) \
-       $(LINK_SYSTEM_DATA) \
        $(LINK_SYSTEM_DATA_DATASETEXTENSTIONS) \
        $(LINK_SYSTEM_NUMERICS) \
        $(LINK_SYSTEM_XML) \
@@ -46,6 +48,12 @@ REF_DEP_RDOTNET = \
        $(LINK_MICROSOFT_CSHARP) \
        $(LINK_RDOTNET_NATIVE)
 
+REF_DEP_CHRONOJUMP_SERVER = \
+       $(LINK_SYSTEM) \
+       $(LINK_SYSTEMDATA) \
+       $(LINK_SYSTEM_WEB_SERVICES) \
+       $(LINK_MONO_POSIX) \
+       $(LINK_MONO_DATA_SQLITE)
 
 
 DIR_BIN = $(top_builddir)/bin
diff --git a/chronojump_server/Makefile.am b/chronojump_server/Makefile.am
index 6fe8324..9a58d96 100644
--- a/chronojump_server/Makefile.am
+++ b/chronojump_server/Makefile.am
@@ -1,24 +1,8 @@
-EXTRA_DIST =
+ASSEMBLY = chronojumpServer
+TARGET = library
+LINK = $(REF_DEP_CHRONOJUMP_SERVER)
 
-
-##########chronojumpServer.dll##########
-
-ASSEMBLY_COMPILER_COMMAND = $(MCS)
-ASSEMBLY_COMPILER_FLAGS =  -noconfig -unsafe -codepage:utf8 -warn:4 -optimize+
-ASSEMBLY = bin/chronojumpServer.dll
-ASSEMBLY_MDB = $(ASSEMBLY).mdb
-COMPILE_TARGET = library
-BUILD_DIR = bin/
-
-RESGEN=resgen2
-
-SERVER=server
-       
-#all: $(ASSEMBLY) $(SERVER)
-all: $(ASSEMBLY)
-
-
-FILES = \
+SOURCES = \
        chronojumpServerCSharp.cs\
        BCrypt.cs\
        ../src/sqlite/*.cs\
@@ -39,9 +23,9 @@ FILES = \
        ../src/runType.cs\
        ../src/pulseType.cs\
        ../src/constants.cs\
-       ../src/multiChronopic.cs\
+       ../src/multiChronopic.cs\
        ../src/sport.cs\
-       ../src/log.cs\
+       ../src/log.cs\
        ../src/serverPing.cs\
        ../src/serverEvaluator.cs\
        ../src/oldCodeNeedToDBConvert/person.cs\
@@ -49,29 +33,5 @@ FILES = \
        ../src/oldCodeNeedToDBConvert/sqlite/*.cs
        
 
-
-REFERENCES =  \
-       System\
-       System.Data\
-       Mono.Data.Sqlite\
-       System.Web.Services\
-       Mono.Posix
-       
-DLL_REFERENCES = 
-PROGRAMFILES = 
-
-CLEANFILES = $(PROGRAMFILES) 
-
-include $(top_srcdir)/Makefile.include
-
-$(eval $(call emit_resgen_targets))
-$(build_xamlg_list): %.xaml.g.cs: %.xaml
-       xamlg '$<'
-
-$(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) 
$(PROJECT_REFERENCES) $(build_xamlg_list) $(build_satellite_assembly_list)
-       mkdir -p $(shell dirname $(ASSEMBLY))
-       $(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) 
$(build_sources_embed) $(build_resources_embed) $(build_references_ref)
-
-
-
+include $(top_srcdir)/build/build.mk
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 2a852a1..653557c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,3 @@
-
 EXTRA_DIST =  chronojump_mini.cs ../images/report_web_style.css angle/*