GNOME.org
 

[chronojump] Simplify Makefiles for Chronojump

commit 6d928508ca62ec92aaa00e35a49fd875a62b3ce7
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date:   Mon Oct 14 14:06:08 2013 +0200

    Simplify Makefiles for Chronojump

 CesarPlayer/Makefile.am           |    4 +-
 Makefile.am                       |    2 +-
 autogen.sh                        |   57 +------
 build/build.environment.mk        |   16 ++
 build/build.rules.mk              |    9 +-
 configure.ac                      |    3 +-
 po/POTFILES.in                    |    3 +-
 src/Makefile.am                   |  376 +++++++++++++------------------------
 src/Mini/Makefile.am              |   15 ++
 src/{ => Mini}/chronojump_mini.cs |    0
 src/{ => Mini}/chronojump_mini.in |    0
 11 files changed, 175 insertions(+), 310 deletions(-)
---
diff --git a/CesarPlayer/Makefile.am b/CesarPlayer/Makefile.am
index 358d751..8961a8c 100644
--- a/CesarPlayer/Makefile.am
+++ b/CesarPlayer/Makefile.am
@@ -46,4 +46,6 @@ DLLCONFIG = CesarPlayer.dll.config
 
 include $(top_srcdir)/build/build.mk
 
-EXTRA_DIST += CesarPlayer.dll.config
+EXTRA_DIST += CesarPlayer.dll.config \
+       gtk-gui/objects.xml \
+       gtk-gui/gui.stetic
diff --git a/Makefile.am b/Makefile.am
index 02239af..04806b9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST = build/m4 expansions.m4
+EXTRA_DIST = build/m4
 
 ACLOCAL_AMFLAGS = -I build/m4 -I build/m4/shave -I build/m4/shamrock
 
diff --git a/autogen.sh b/autogen.sh
index dddeceb..f6ff02c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,58 +1,3 @@
 #! /bin/sh
 
-PROJECT=ChronoJump
-FILE=
-CONFIGURE=configure.ac
-
-: ${AUTOCONF=autoconf}
-: ${AUTOHEADER=autoheader}
-: ${AUTOMAKE=automake}
-: ${LIBTOOLIZE=libtoolize}
-: ${INTLTOOLIZE=intltoolize}
-: ${ACLOCAL=aclocal}
-: ${LIBTOOL=libtool}
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd $srcdir
-TEST_TYPE=-f
-aclocalinclude="-I build/m4/shamrock -I build/m4/shave $ACLOCAL_FLAGS"
-conf_flags="--enable-maintainer-mode"
-
-#test $TEST_TYPE $FILE || {
-#        echo "You must run this script in the top-level $PROJECT directory"
-#        exit 1
-#}
-
-if test -z "$*"; then
-        echo "I am going to run ./configure with no arguments - if you wish "
-        echo "to pass any to it, please specify them on the $0 command line."
-fi
-
-case $CC in
-*xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
-esac
-
-(grep "^AM_PROG_LIBTOOL" $CONFIGURE >/dev/null) && {
-    echo "Running $LIBTOOLIZE ..."
-    $LIBTOOLIZE --force --copy --automake
-}
-
-(grep "^IT_PROG_INTLTOOL" $CONFIGURE >/dev/null) && {
-    echo "Running $INTLTOOLIZE ..."
-    $INTLTOOLIZE --force --copy --automake
-}
-
-echo "Running $ACLOCAL $aclocalinclude ..."
-$ACLOCAL $aclocalinclude
-
-echo "Running $AUTOMAKE --gnu $am_opt ..."
-$AUTOMAKE --add-missing --gnu $am_opt
-
-echo "Running $AUTOCONF ..."
-$AUTOCONF
-
-echo Running $srcdir/configure $conf_flags "$@" ...
-$srcdir/configure  $conf_flags "$@" \
+autoreconf -ivf
diff --git a/build/build.environment.mk b/build/build.environment.mk
index 7c52168..07356db 100644
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -21,9 +21,25 @@ 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_GLADE = $(GLADE_SHARP_20_LIBS)
+LINK_CESARPLAYER = -r:$(DIR_BIN)/CesarPlayer.dll
 LINK_RDOTNET = -r:$(DIR_BIN)/RDotNet.dll
 LINK_RDOTNET_NATIVE = -r:$(DIR_BIN)/RDotNet.NativeLibrary.dll
 
+REF_DEP_CHRONOJUMP = \
+       $(LINK_SYSTEM) \
+       $(LINK_SYSTEMDATA) \
+       $(LINK_SYSTEM_DRAWING) \
+       $(LINK_SYSTEM_WEB_SERVICES) \
+       $(LINK_SYSTEM_XML) \
+       $(LINK_MONO_POSIX) \
+       $(LINK_MONO_DATA_SQLITE) \
+       $(LINK_GLIB) \
+       $(LINK_GLADE) \
+       $(LINK_GTK) \
+       $(LINK_CESARPLAYER) \
+       $(LINK_RDOTNET)
+
 REF_DEP_CESARPLAYER = \
        $(LINK_SYSTEM) \
        $(LINK_MONO_POSIX) \
diff --git a/build/build.rules.mk b/build/build.rules.mk
index 43112df..20a5f45 100644
--- a/build/build.rules.mk
+++ b/build/build.rules.mk
@@ -4,9 +4,12 @@ BUILD_DATA_DIR = $(top_builddir)/bin/share/$(PACKAGE)
 SOURCES_BUILD = $(addprefix $(srcdir)/, $(SOURCES))
 #SOURCES_BUILD += $(top_srcdir)/src/AssemblyInfo.cs
 
+SUBST = ,
+RESOURCES_D := $(foreach res,$(RESOURCES),$(firstword $(subst $(SUBST), ,$(strip $(res)))))
+RESOURCES_DIST := $(addprefix $(srcdir)/, $(RESOURCES_D))
 RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
 RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
-       -resource:$(resource),$(notdir $(resource)))
+       -resource:$(resource))
 
 #INSTALL_ICONS = $(top_srcdir)/build/private-icon-theme-installer "$(mkinstalldirs)" "$(INSTALL_DATA)"
 #THEME_ICONS_SOURCE = $(wildcard $(srcdir)/ThemeIcons/*/*/*.png) $(wildcard 
$(srcdir)/ThemeIcons/scalable/*/*.svg)
@@ -64,7 +67,7 @@ build-debug:
 
 $(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
 
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(DEP_LINK)
        @mkdir -p $(top_builddir)/bin
        $(MCS) \
                $(GMCS_FLAGS) \
@@ -89,7 +92,7 @@ uninstall-hook: $(THEME_ICONS_SOURCE)
        @$(INSTALL_ICONS) -u "$(DESTDIR)$(pkgdatadir)" "$(srcdir)" $(THEME_ICONS_RELATIVE)
        $(EXTRA_UNINSTALL_HOOK)
 
-EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) $(IMAGES) $(LOGO) $(LOGO_48) 
$(desktop_in_files)
+EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_DIST) $(THEME_ICONS_SOURCE) $(IMAGES) $(LOGO) $(LOGO_48) 
$(desktop_in_files)
 
 CLEANFILES = $(OUTPUT_FILES)
 DISTCLEANFILES = *.pidb $(desktop_DATA)
diff --git a/configure.ac b/configure.ac
index f893f15..80c6166 100644
--- a/configure.ac
+++ b/configure.ac
@@ -146,14 +146,15 @@ chronopic-firmware/chronopic-firmwarecord/libIris/Makefile
 chronopic-firmware/chronopic-firmwarecord/chronopic-firmwarecord
 chronopic-tests/Makefile
 src/Makefile
+src/Mini/Makefile
 po/Makefile
 chronojump_server/Makefile
 encoder/Makefile
 manual/Makefile
 src/AssemblyInfo.cs
 src/chronojump
-src/chronojump_mini
 src/chronojump.desktop
+src/Mini/chronojump_mini
 libcesarplayer/Makefile
 CesarPlayer/Makefile
 CesarPlayer/AssemblyInfo.cs
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 03695a7..3920b0b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -10,7 +10,7 @@ glade/chronojump.glade
 libcesarplayer/bacon-video-widget-gst-0.10.c
 libcesarplayer/video-utils.c
 src/chronojump.cs
-src/chronojump_mini.cs
+src/Mini/chronojump_mini.cs
 src/constants.cs
 src/encoder.cs
 src/execute/event.cs
@@ -45,7 +45,6 @@ src/gui/server.cs
 src/gui/session.cs
 src/gui/stats.cs
 src/jumpType.cs
-src/platform.cs
 src/pulseType.cs
 src/report.cs
 src/runType.cs
diff --git a/src/Makefile.am b/src/Makefile.am
index 653557c..4dbd4d5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,166 +1,105 @@
-EXTRA_DIST =  chronojump_mini.cs ../images/report_web_style.css angle/*
+SUBDIRS = Mini
 
+ASSEMBLY = Chronojump
+TARGET = exe
+LINK = $(REF_DEP_CHRONOJUMP)
 
-if ENABLE_DEBUG
-ASSEMBLY_COMPILER_COMMAND = $(MCS)
-ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -nowarn:169,649 -optimize+ -debug -define:DEBUG 
-ASSEMBLY = bin/Debug/Chronojump.exe
-ASSEMBLY_MDB = $(ASSEMBLY).mdb
-COMPILE_TARGET = exe
-BUILD_DIR = bin/Debug
-CHRONOJUMP_EXE_MDB_SOURCE=bin/Debug/Chronojump.exe.mdb
-CHRONOJUMP_MINI_EXE=bin/Debug/Chronojump_Mini.exe
-PROJECT_REFERENCES =  \
-       ../CesarPlayer/bin/Debug/CesarPlayer.dll
-CESARPLAYER_DLL_SOURCE=../CesarPlayer/bin/Debug/CesarPlayer.dll
-CESARPLAYER_DLL=$(BUILD_DIR)/CesarPlayer.dll
-CESARPLAYER_DLL_MDB_SOURCE=../CesarPlayer/bin/Debug/CesarPlayer.dll.mdb
-CESARPLAYER_DLL_MDB=$(BUILD_DIR)/CesarPlayer.dll.mdb
-endif
-
-if ENABLE_RELEASE
-ASSEMBLY_COMPILER_COMMAND = $(MCS)
-ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -nowarn:169,649 -optimize+ 
-ASSEMBLY = bin/Release/Chronojump.exe
-ASSEMBLY_MDB = 
-COMPILE_TARGET = exe
-BUILD_DIR = bin/Release
-CHRONOJUMP_EXE_MDB_SOURCE=
-CHRONOJUMP_MINI_EXE=bin/Release/Chronojump_Mini.exe
-PROJECT_REFERENCES =  \
-       ../CesarPlayer/bin/Release/CesarPlayer.dll
-CESARPLAYER_DLL_SOURCE=../CesarPlayer/bin/Release/CesarPlayer.dll
-CESARPLAYER_DLL=$(BUILD_DIR)/CesarPlayer.dll
-endif
-
-AL=al2
-SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll
-
-COMMONAPPLICATIONDATAROOT_IMAGES = \
-       ../images/chronojump-logo-2013.png \
-       ../images/chronojump-logo-2013_320.png
-
-COMMONAPPLICATIONDATA_ROOT = \
-       ../images/report_web_style.css
- 
-
-PROGRAMFILES = \
-       $(CESARPLAYER_DLL) \
-       $(CHRONOJUMP_MINI_EXE)
-
-LINUX_DESKTOPAPPLICATIONS = \
-       $(CHRONOJUMP_DESKTOP) 
-
-COMMONAPPLICATIONDATAROOT_LOGO = \
-       $(CHRONOJUMP_LOGO)
-
-BINARIES = \
-       $(CHRONOJUMP)\
-       $(CHRONOJUMP_MINI)
-
-        
-
-
-RESGEN=resgen2
-       
-all: $(ASSEMBLY) $(COMMONAPPLICATIONDATA_ROOT) $(COMMONAPPLICATIONDATAROOT_IMAGES) 
$(COMMONAPPLICATIONDATAROOT_LOGO) $(PROGRAMFILES) $(LINUX_DESKTOPAPPLICATIONS) $(BINARIES) 
-
-FILES = \
+SOURCES = \
        gui/chronojump.cs\
        gui/chronopic.cs\
        gui/confirm.cs\
        gui/encoder.cs\
        gui/error.cs\
        gui/eventExecute.cs\
-       gui/eventGraphConfigure.cs\
-       gui/event.cs\
-       gui/jump.cs\
-       gui/jumpType.cs\
-       gui/run.cs\
-       gui/runType.cs\
-       gui/reactionTime.cs\
-       gui/pulse.cs\
-       gui/multiChronopic.cs\
-       gui/person.cs\
-       gui/preferences.cs\
-       gui/session.cs\
-       gui/stats.cs\
-       gui/presentation.cs\
+       gui/eventGraphConfigure.cs\
+       gui/event.cs\
+       gui/jump.cs\
+       gui/jumpType.cs\
+       gui/run.cs\
+       gui/runType.cs\
+       gui/reactionTime.cs\
+       gui/pulse.cs\
+       gui/multiChronopic.cs\
+       gui/person.cs\
+       gui/preferences.cs\
+       gui/session.cs\
+       gui/stats.cs\
+       gui/presentation.cs\
        gui/report.cs\
        gui/about.cs\
        gui/helpPorts.cs\
        gui/dialogMessage.cs\
-       gui/dialogCalendar.cs\
+       gui/dialogCalendar.cs\
        gui/dialogImageTest.cs\
-       gui/language.cs\
+       gui/language.cs\
        gui/repetitiveConditions.cs\
        gui/chronopicConnection.cs\
        gui/convertWeight.cs\
-       gui/genericWindow.cs\
-       gui/splash.cs\
+       gui/genericWindow.cs\
+       gui/splash.cs\
        gui/server.cs\
        gui/dialogServerStats.cs\
-       gui/evaluator.cs\
-       gui/queryServer.cs\
+       gui/evaluator.cs\
+       gui/queryServer.cs\
        gui/usefulObjects.cs\
        statType.cs\
        stats/main.cs\
        stats/global.cs\
        stats/sjCmjAbk.cs\
-       stats/sjCmjAbkPlus.cs\
-       stats/djIndex.cs\
-       stats/djQ.cs\
-       stats/jumpSimpleSubtraction.cs\
-       stats/rjIndex.cs\
-       stats/rjPotencyBosco.cs\
-       stats/rjEvolution.cs\
-       stats/jumpIndexes.cs\
-       stats/fv.cs\
-       stats/potency.cs\
-       stats/rjAVGSD.cs\
-       stats/runSimple.cs\
-       stats/runIntervallic.cs\
+       stats/sjCmjAbkPlus.cs\
+       stats/djIndex.cs\
+       stats/djQ.cs\
+       stats/jumpSimpleSubtraction.cs\
+       stats/rjIndex.cs\
+       stats/rjPotencyBosco.cs\
+       stats/rjEvolution.cs\
+       stats/jumpIndexes.cs\
+       stats/fv.cs\
+       stats/potency.cs\
+       stats/rjAVGSD.cs\
+       stats/runSimple.cs\
+       stats/runIntervallic.cs\
        stats/graphs/graphData.cs\
-       stats/graphs/graphROptions.cs\
-       stats/graphs/graphSerie.cs\
-       stats/graphs/global.cs\
-       stats/graphs/sjCmjAbk.cs\
-       stats/graphs/sjCmjAbkPlus.cs\
-       stats/graphs/djIndex.cs\
-       stats/graphs/djQ.cs\
-       stats/graphs/rjIndex.cs\
-       stats/graphs/rjPotencyBosco.cs\
-       stats/graphs/rjEvolution.cs\
-       stats/graphs/jumpIndexes.cs\
-       stats/graphs/fv.cs\
-       stats/graphs/potency.cs\
+       stats/graphs/graphROptions.cs\
+       stats/graphs/graphSerie.cs\
+       stats/graphs/global.cs\
+       stats/graphs/sjCmjAbk.cs\
+       stats/graphs/sjCmjAbkPlus.cs\
+       stats/graphs/djIndex.cs\
+       stats/graphs/djQ.cs\
+       stats/graphs/rjIndex.cs\
+       stats/graphs/rjPotencyBosco.cs\
+       stats/graphs/rjEvolution.cs\
+       stats/graphs/jumpIndexes.cs\
+       stats/graphs/fv.cs\
+       stats/graphs/potency.cs\
        stats/graphs/rjAVGSD.cs\
-       stats/graphs/runSimple.cs\
-       stats/graphs/runIntervallic.cs\
-       stats/graphs/jumpSimpleSubtraction.cs\
+       stats/graphs/runSimple.cs\
+       stats/graphs/runIntervallic.cs\
+       stats/graphs/jumpSimpleSubtraction.cs\
        sqlite/main.cs\
-       sqlite/preferences.cs\
-       sqlite/session.cs\
-       sqlite/encoder.cs\
-       sqlite/jump.cs\
-       sqlite/jumpRj.cs\
-       sqlite/jumpType.cs\
-       sqlite/run.cs\
-       sqlite/runInterval.cs\
-       sqlite/runType.cs\
-       sqlite/person.cs\
-       sqlite/personSession.cs\
-       sqlite/personSessionNotUpload.cs\
-       sqlite/stat.cs\
-       sqlite/pulse.cs\
-       sqlite/pulseType.cs\
-       sqlite/reactionTime.cs\
-       sqlite/multiChronopic.cs\
-       sqlite/event.cs\
-       sqlite/sport.cs\
-       sqlite/speciallity.cs\
-       sqlite/country.cs\
-       sqlite/server.cs\
+       sqlite/preferences.cs\
+       sqlite/session.cs\
+       sqlite/encoder.cs\
+       sqlite/jump.cs\
+       sqlite/jumpRj.cs\
+       sqlite/jumpType.cs\
+       sqlite/run.cs\
+       sqlite/runInterval.cs\
+       sqlite/runType.cs\
+       sqlite/person.cs\
+       sqlite/personSession.cs\
+       sqlite/personSessionNotUpload.cs\
+       sqlite/stat.cs\
+       sqlite/pulse.cs\
+       sqlite/pulseType.cs\
+       sqlite/reactionTime.cs\
+       sqlite/multiChronopic.cs\
+       sqlite/event.cs\
+       sqlite/sport.cs\
+       sqlite/speciallity.cs\
+       sqlite/country.cs\
+       sqlite/server.cs\
        execute/event.cs\
        execute/jump.cs\
        execute/run.cs\
@@ -171,62 +110,47 @@ FILES = \
        AssemblyInfo.cs\
        chronojump.cs\
        encoder.cs\
-       event.cs\
-       eventType.cs\
-       jump.cs\
-       jumpType.cs\
+       event.cs\
+       eventType.cs\
+       jump.cs\
+       jumpType.cs\
        person.cs\
        personSession.cs\
        run.cs\
-       runType.cs\
-       pulse.cs\
-       pulseType.cs\
-       reactionTime.cs\
-       reactionTimeType.cs\
-       multiChronopic.cs\
+       runType.cs\
+       pulse.cs\
+       pulseType.cs\
+       reactionTime.cs\
+       reactionTimeType.cs\
+       multiChronopic.cs\
        multiChronopicType.cs\
-       session.cs\
-       exportSession.cs\
-       treeViewEvent.cs\
-       treeViewPerson.cs\
-       treeViewJump.cs\
-       treeViewRun.cs\
-       treeViewPulse.cs\
-       treeViewReactionTime.cs\
-       treeViewMultiChronopic.cs\
-       util.cs\
-       utilAll.cs\
-       utilDate.cs\
-       utilGtk.cs\
-       utilVideo.cs\
-       constants.cs\
-       report.cs\
-       sport.cs\
-       log.cs\
-       serverPing.cs\
-       serverEvaluator.cs\
-       server.cs\
-       chronopic.cs\
-       oldCodeNeedToDBConvert/person.cs\
-       oldCodeNeedToDBConvert/personSession.cs\
-       oldCodeNeedToDBConvert/sqlite/person.cs\
-       oldCodeNeedToDBConvert/sqlite/personSession.cs\
-       oldCodeNeedToDBConvert/sqlite/session.cs
-
-CHRONOJUMP_MINI_FILES=\
-       chronojump_mini.cs\
-       chronopic.cs\
+       session.cs\
+       exportSession.cs\
+       treeViewEvent.cs\
+       treeViewPerson.cs\
+       treeViewJump.cs\
+       treeViewRun.cs\
+       treeViewPulse.cs\
+       treeViewReactionTime.cs\
+       treeViewMultiChronopic.cs\
+       util.cs\
        utilAll.cs\
        utilDate.cs\
+       utilGtk.cs\
+       utilVideo.cs\
+       constants.cs\
+       report.cs\
+       sport.cs\
        log.cs\
-       constants.cs
-
-
-
-#CHRONOJUMP_MINI_VALIDATE_FILES=
-
-
-DATA_FILES = 
+       serverPing.cs\
+       serverEvaluator.cs\
+       server.cs\
+       chronopic.cs\
+       oldCodeNeedToDBConvert/person.cs\
+       oldCodeNeedToDBConvert/personSession.cs\
+       oldCodeNeedToDBConvert/sqlite/person.cs\
+       oldCodeNeedToDBConvert/sqlite/personSession.cs\
+       oldCodeNeedToDBConvert/sqlite/session.cs
 
 RESOURCES = \
        ../glade/chronojump.glade\
@@ -236,9 +160,9 @@ RESOURCES = \
        ../images/agility_20yard.png,agility_20yard.png\
        ../images/mini/agility_20yard.png,mini/agility_20yard.png \
        ../images/agility_illinois.png,agility_illinois.png\
-       ../images/mini/agility_illinois.png,mini/agility_illinois.png \
+       ../images/mini/agility_illinois.png,mini/agility_illinois.png \
        ../images/agility_shuttle.png,agility_shuttle.png\
-       ../images/mini/agility_shuttle.png,mini/agility_shuttle.png \
+       ../images/mini/agility_shuttle.png,mini/agility_shuttle.png \
        ../images/agility_zigzag.png,agility_zigzag.png\
        ../images/mini/agility_zigzag.png,mini/agility_zigzag.png \
        ../images/jump_free.png,jump_free.png\
@@ -266,7 +190,7 @@ RESOURCES = \
        ../images/jump_rj_in.png,jump_rj_in.png \
        ../images/mini/jump_rj_in.png,mini/jump_rj_in.png \
        ../images/jump_rj_hexagon.png,jump_rj_hexagon.png \
-       ../images/mini/jump_rj_hexagon.png,mini/jump_rj_hexagon.png \
+       ../images/mini/jump_rj_hexagon.png,mini/jump_rj_hexagon.png \
        ../images/run_simple.png,run_simple.png \
        ../images/mini/run_simple.png,mini/run_simple.png \
        ../images/run_interval.png,run_interval.png \
@@ -275,7 +199,7 @@ RESOURCES = \
        ../images/mini/margaria.png,mini/margaria.png \
        ../images/gesell_dbt.png,gesell_dbt.png \
        ../images/mini/gesell_dbt.png,mini/gesell_dbt.png \
-       ../images/multiChronopic.png,multiChronopic.png \
+       ../images/multiChronopic.png,multiChronopic.png \
        ../images/mini/multiChronopic.png,mini/multiChronopic.png \
        ../images/run_analysis.png,run_analysis.png \
        ../images/mini/run_analysis.png,mini/run_analysis.png \
@@ -285,15 +209,15 @@ RESOURCES = \
        ../images/mini/pulse_custom.png,mini/pulse_custom.png \
        ../images/reaction_time.png,reaction_time.png \
        ../images/mini/reaction_time.png,mini/reaction_time.png \
-       ../images/mtgug.png,mtgug.png   \
+       ../images/mtgug.png,mtgug.png \
        ../images/mini/mtgug.png,mini/mtgug.png \
        ../images/take_off.png,take_off.png \
        ../images/mini/take_off.png,mini/take_off.png \
-       ../images/chronopic1.jpg,chronopic1.jpg \
+       ../images/chronopic1.jpg,chronopic1.jpg \
        ../images/mini/chronopic1.jpg,mini/chronopic1.jpg \
        ../images/chronopic2.jpg,chronopic2.jpg \
        ../images/mini/chronopic2.jpg,mini/chronopic2.jpg \
-       ../images/chronopic3.jpg,chronopic3.jpg \
+       ../images/chronopic3.jpg,chronopic3.jpg \
        ../images/mini/chronopic3.jpg,mini/chronopic3.jpg \
        ../images/modular_platform_with_chronopic.jpg,modular_platform_with_chronopic.jpg \
        ../images/mini/modular_platform_with_chronopic.jpg,mini/modular_platform_with_chronopic.jpg \
@@ -332,63 +256,23 @@ RESOURCES = \
        ../images/gtk-open-plus.png,gtk-open-plus.png \
        ../images/calendar.png,calendar.png \
        ../images/chronojump-logo-2013_320.png,chronojump-logo-2013_320.png \
-       ../images/chronojump-logo-2013.png,chronojump-logo-2013.png 
-
-
-EXTRAS = \
-       chronojump.in\
-       chronojump_mini.in
-
-REFERENCES =  \
-       $(GTK_SHARP_20_LIBS) \
-       $(GLIB_SHARP_20_LIBS) \
-       $(GLADE_SHARP_20_LIBS) \
-       $(WEBKIT_SHARP_10_LIBS) \
-       System\
-       System.Data\
-       System.Drawing\
-       System.Web.Services\
-       System.Xml\
-       Mono.Data.Sqlite\
-       Mono.Posix
-
-
-
-#DLL_REFERENCES =  \
-#      ../rdotnet/R.NET/bin/Debug/RDotNet.dll
-
-
-#CLEANFILES = $(COMMONAPPLICATIONDATA_ROOT) $(COMMONAPPLICATIONDATAROOT_IMAGES) 
$(COMMONAPPLICATIONDATAROOT_LOGO) $(PROGRAMFILES) $(LINUX_DESKTOPAPPLICATIONS) $(BINARIES) 
-CLEANFILES = $(PROGRAMFILES) $(LINUX_DESKTOPAPPLICATIONS) $(BINARIES) 
-
-
-include $(top_srcdir)/Makefile.include
-
-
-CHRONOJUMP_LOGO_SOURCE=../images/chronojump_icon.png
-CHRONOJUMP_LOGO=$(BUILD_DIR)/chronojump.png
-CHRONOJUMP_DESKTOP_SOURCE=chronojump.desktop
-CHRONOJUMP_DESKTOP = $(BUILD_DIR)/chronojump.desktop
-CHRONOJUMP_EXE_MDB = $(BUILD_DIR)/ChronoJump.exe.mdb
-CHRONOJUMP=$(BUILD_DIR)/chronojump
-CHRONOJUMP_MINI=$(BUILD_DIR)/chronojump_mini
+       ../images/chronojump-logo-2013.png,chronojump-logo-2013.png
 
-$(eval $(call emit-deploy-target,CESARPLAYER_DLL))
-$(eval $(call emit-deploy-wrapper,CHRONOJUMP,chronojump,x))
-$(eval $(call emit-deploy-wrapper,CHRONOJUMP_MINI,chronojump_mini,x))
-$(eval $(call emit-deploy-target,CHRONOJUMP_DESKTOP))
-$(eval $(call emit-deploy-target,CHRONOJUMP_LOGO))
+IMAGES = $(top_srcdir)/images/chronojump-logo-2013.png \
+         $(top_srcdir)/images/chronojump-logo-2013_320.png \
+         $(top_srcdir)/images/report_web_style.css
 
+LOGO = $(top_srcdir)/images/svg/chronojump-logo-2013.svg
 
-$(eval $(call emit_resgen_targets))
-$(build_xamlg_list): %.xaml.g.cs: %.xaml
-       xamlg '$<'
+bin_SCRIPTS = chronojump
 
-$(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)
+DESKTOP_FILE = chronojump.desktop.in
 
+include $(top_srcdir)/build/build.mk
 
-$(CHRONOJUMP_MINI_EXE):
-       $(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) $(CHRONOJUMP_MINI_FILES) 
-out:$(CHRONOJUMP_MINI_EXE) -target:$(COMPILE_TARGET) -r:Mono.Posix -r:System -r:System.Data
+EXTRA_DIST += \
+       chronojump.in \
+       AssemblyInfo.cs.in \
+       ../images/report_web_style.css \
+       $(top_srcdir)/src/angle/*
 
diff --git a/src/Mini/Makefile.am b/src/Mini/Makefile.am
new file mode 100644
index 0000000..1f20b19
--- /dev/null
+++ b/src/Mini/Makefile.am
@@ -0,0 +1,15 @@
+ASSEMBLY = Chronojump_Mini
+TARGET = exe
+LINK = $(REF_DEP_CHRONOJUMP)
+
+SOURCES= \
+       chronojump_mini.cs \
+       ../chronopic.cs \
+       ../utilAll.cs \
+       ../utilDate.cs \
+       ../log.cs \
+       ../constants.cs
+
+bin_SCRIPTS = chronojump_mini
+
+include $(top_srcdir)/build/build.mk
diff --git a/src/chronojump_mini.cs b/src/Mini/chronojump_mini.cs
similarity index 100%
rename from src/chronojump_mini.cs
rename to src/Mini/chronojump_mini.cs
diff --git a/src/chronojump_mini.in b/src/Mini/chronojump_mini.in
similarity index 100%
rename from src/chronojump_mini.in
rename to src/Mini/chronojump_mini.in
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]