GNOME.org
 

[tasque/transition: 46/213] Update auto tools build files

commit 62d9675f2889579887c82881fd4161df4526168c
Author: Antonius Riha <antoniusriha gmail com>
Date:   Tue May 29 12:00:44 2012 +0200

    Update auto tools build files
    
    * updated .gitignore to exclude auto tools ouptut
    * removed pc.in files, since those are not required any more
    * added fixautotoolsbuild.sh: this is a workaround of a bug with the Auto tools files generation of MD (#5164 at Xamarin Bugzilla)
    
    The auto tools files update procedure consists of the following steps:
    1) In MD: Right click the Solution (tasque) in the Solution Explorer, select "Tools" and therein "Generate Makefiles..."
    2) In the dialog: Select "Auto tools based Makefile" and as Configuration "LinuxRelease". Click "Ok".
    3) In terminal: Navigate to the solution directory and execute: ./build/fixautotoolsbuild.sh

 .gitignore                    |    6 ++
 Makefile.am                   |   14 ++--
 Makefile.include              |    7 +-
 build/fixautotoolsbuild.sh    |   19 ++++++
 configure.ac                  |   46 +++++++---------
 src/RtmNet/Makefile.am        |   48 +++++++---------
 src/RtmNet/rtmnet.pc.in       |    6 --
 src/libtasque/Makefile.am     |   39 ++++++-------
 src/libtasque/libtasque.pc.in |    6 --
 src/tasque/Makefile.am        |  124 ++++++++++++++++++++++++-----------------
 tests/Makefile.am             |   58 ++++++++++----------
 11 files changed, 196 insertions(+), 177 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 359cb4e..52c133e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,12 @@
 Makefile
 Makefile.in
 configure
+aclocal.m4
+/config.log
+/config.status
+/install-sh
+/missing
+/src/tasque/tasque
 
 # VS and MD
 *.userprefs
diff --git a/Makefile.am b/Makefile.am
index 5e735d0..84dc85e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,14 +3,14 @@ EXTRA_DIST =  expansions.m4
 
 #Warning: This is an automatically generated file, do not edit!
 if ENABLE_RELEASE
- SUBDIRS =  src/RtmNet src/libtasque tests po src/tasque
+ SUBDIRS =  src/libtasque src/RtmNet po src/tasque
 endif
-if ENABLE_LINUXDEBUG
- SUBDIRS =  src/RtmNet src/libtasque tests po src/tasque
+if ENABLE_DEBUG
+ SUBDIRS =  src/libtasque src/RtmNet tests po src/tasque
 endif
-if ENABLE_WINDEBUG
- SUBDIRS =  src/RtmNet src/libtasque tests src/tasque
+if ENABLE_LINUXDEBUG
+ SUBDIRS =  src/libtasque src/RtmNet tests src/tasque
 endif
-if ENABLE_MACDEBUG
- SUBDIRS =  src/RtmNet src/libtasque tests src/tasque
+if ENABLE_LINUXRELEASE
+ SUBDIRS =  src/libtasque src/RtmNet src/tasque
 endif
diff --git a/Makefile.include b/Makefile.include
index 413bbdb..1936487 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -62,11 +62,12 @@ EXTRA_DIST += $(build_sources) $(build_resx_files) $(build_others_files) $(ASSEM
 CLEANFILES += $(ASSEMBLY) $(ASSEMBLY).mdb $(BINARIES) $(build_resx_resources) $(build_satellite_assembly_list)
 DISTCLEANFILES = $(GENERATED_FILES) $(pc_files) $(BUILD_DIR)/*
 
+programfilesdir = $(pkglibdir)
+
 bin_SCRIPTS = $(BINARIES)
+
 programfilesdir = @libdir@/@PACKAGE@
 programfiles_DATA = $(ASSEMBLY) $(PROGRAMFILES)
-linuxpkgconfigdir = @libdir@/pkgconfig
-linuxpkgconfig_DATA = $(LINUX_PKGCONFIG)
 
 
 # macros
@@ -113,4 +114,4 @@ $(install_satellite_assembly_list):
 install-satellite-assemblies: $(install_satellite_assembly_list)
 	
 uninstall-satellite-assemblies:
-	rm -rf $(install_satellite_assembly_list)
+	rm -rf $(install_satellite_assembly_list)
\ No newline at end of file
diff --git a/build/fixautotoolsbuild.sh b/build/fixautotoolsbuild.sh
new file mode 100755
index 0000000..7e7c984
--- /dev/null
+++ b/build/fixautotoolsbuild.sh
@@ -0,0 +1,19 @@
+# work around "main assembly missing" bug
+
+inclfile="Makefile.include"
+
+cp "$inclfile" "${inclfile}.in"
+
+cat "${inclfile}.in" | \
+sed -e 's/programfiles_DATA = $(ASSEMBLY)//' | \
+sed -e 's/programfiles_DATA = $(PROGRAMFILES)/programfiles_DATA = $(ASSEMBLY) $(PROGRAMFILES)/' > "$inclfile"
+
+rm "${inclfile}.in"
+#VERSION=$(cat CommonAssemblyInfo.cs | grep "assembly: AssemblyVersion" | perl -pe "s/.*\"(.*)\".*/\1/")
+
+#echo $VERSION
+
+#tmp=$(tempfile)
+#cat ../configure.ac | perl -pe "s/(AC_INIT\(\[tasque\], \[).+(\]\))/\${1}$VERSION\$2/" > tmp
+
+#mv tmp ../configure.ac
diff --git a/configure.ac b/configure.ac
index 56c7a75..470ed13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,10 +17,6 @@ SHAMROCK_EXPAND_DATADIR
 
 AC_PROG_INSTALL
 
-AC_PATH_PROG(GMCS, gmcs, no)
-if test "x$GMCS" = "xno"; then
-        AC_MSG_ERROR([gmcs Not found])
-fi
 AC_PATH_PROG(DMCS, dmcs, no)
 if test "x$DMCS" = "xno"; then
         AC_MSG_ERROR([dmcs Not found])
@@ -29,12 +25,20 @@ fi
 
 AC_ARG_ENABLE(release,
 	AC_HELP_STRING([--enable-release],
-		[Use 'RELEASE' Configuration [default=YES]]),
+		[Use 'RELEASE' Configuration [default=NO]]),
 		enable_release=yes, enable_release=no)
 AM_CONDITIONAL(ENABLE_RELEASE, test x$enable_release = xyes)
 if test "x$enable_release" = "xyes" ; then
 	CONFIG_REQUESTED="yes"
 fi
+AC_ARG_ENABLE(debug,
+	AC_HELP_STRING([--enable-debug],
+		[Use 'DEBUG' Configuration [default=NO]]),
+		enable_debug=yes, enable_debug=no)
+AM_CONDITIONAL(ENABLE_DEBUG, test x$enable_debug = xyes)
+if test "x$enable_debug" = "xyes" ; then
+	CONFIG_REQUESTED="yes"
+fi
 AC_ARG_ENABLE(linuxdebug,
 	AC_HELP_STRING([--enable-linuxdebug],
 		[Use 'LINUXDEBUG' Configuration [default=NO]]),
@@ -43,49 +47,39 @@ AM_CONDITIONAL(ENABLE_LINUXDEBUG, test x$enable_linuxdebug = xyes)
 if test "x$enable_linuxdebug" = "xyes" ; then
 	CONFIG_REQUESTED="yes"
 fi
-AC_ARG_ENABLE(windebug,
-	AC_HELP_STRING([--enable-windebug],
-		[Use 'WINDEBUG' Configuration [default=NO]]),
-		enable_windebug=yes, enable_windebug=no)
-AM_CONDITIONAL(ENABLE_WINDEBUG, test x$enable_windebug = xyes)
-if test "x$enable_windebug" = "xyes" ; then
-	CONFIG_REQUESTED="yes"
-fi
-AC_ARG_ENABLE(macdebug,
-	AC_HELP_STRING([--enable-macdebug],
-		[Use 'MACDEBUG' Configuration [default=NO]]),
-		enable_macdebug=yes, enable_macdebug=no)
-AM_CONDITIONAL(ENABLE_MACDEBUG, test x$enable_macdebug = xyes)
-if test "x$enable_macdebug" = "xyes" ; then
+AC_ARG_ENABLE(linuxrelease,
+	AC_HELP_STRING([--enable-linuxrelease],
+		[Use 'LINUXRELEASE' Configuration [default=YES]]),
+		enable_linuxrelease=yes, enable_linuxrelease=no)
+AM_CONDITIONAL(ENABLE_LINUXRELEASE, test x$enable_linuxrelease = xyes)
+if test "x$enable_linuxrelease" = "xyes" ; then
 	CONFIG_REQUESTED="yes"
 fi
 if test -z "$CONFIG_REQUESTED" ; then
-	AM_CONDITIONAL(ENABLE_RELEASE, true)
-	enable_release=yes
+	AM_CONDITIONAL(ENABLE_LINUXRELEASE, true)
+	enable_linuxrelease=yes
 fi
 
 
 dnl package checks, common for all configs
 PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0])
-PKG_CHECK_MODULES([MONO_NUNIT], [mono-nunit])
 PKG_CHECK_MODULES([GLIB_SHARP_20], [glib-sharp-2.0])
 PKG_CHECK_MODULES([NDESK_DBUS_10], [ndesk-dbus-1.0])
 PKG_CHECK_MODULES([GNOME_SHARP_20], [gnome-sharp-2.0])
 PKG_CHECK_MODULES([NOTIFY_SHARP], [notify-sharp])
 PKG_CHECK_MODULES([NDESK_DBUS_GLIB_10], [ndesk-dbus-glib-1.0])
+PKG_CHECK_MODULES([MONO_NUNIT], [mono-nunit])
 
 dnl package checks, per config
 
 
 AC_CONFIG_FILES([
-src/RtmNet/rtmnet.pc
-src/RtmNet/Makefile
-src/libtasque/libtasque.pc
 src/libtasque/Makefile
-tests/Makefile
+src/RtmNet/Makefile
 po/Makefile
 src/tasque/tasque
 src/tasque/Makefile
+tests/Makefile
 Makefile
 
 ])
diff --git a/src/RtmNet/Makefile.am b/src/RtmNet/Makefile.am
index 66e27fe..94a5156 100644
--- a/src/RtmNet/Makefile.am
+++ b/src/RtmNet/Makefile.am
@@ -4,73 +4,69 @@ EXTRA_DIST =
 # Warning: This is an automatically generated file, do not edit!
 
 if ENABLE_RELEASE
-ASSEMBLY_COMPILER_COMMAND = gmcs
+ASSEMBLY_COMPILER_COMMAND = dmcs
 ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+ "-define:TRACE"
 ASSEMBLY = bin/Release/RtmNet.dll
 ASSEMBLY_MDB = 
 COMPILE_TARGET = library
 PROJECT_REFERENCES = 
-BUILD_DIR = bin/Release/
+BUILD_DIR = bin/Release
 
 RTMNET_DLL_MDB=
 
 endif
 
-if ENABLE_LINUXDEBUG
-ASSEMBLY_COMPILER_COMMAND = gmcs
+if ENABLE_DEBUG
+ASSEMBLY_COMPILER_COMMAND = dmcs
 ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG;TRACE"
 ASSEMBLY = bin/Debug/RtmNet.dll
 ASSEMBLY_MDB = $(ASSEMBLY).mdb
 COMPILE_TARGET = library
 PROJECT_REFERENCES = 
-BUILD_DIR = bin/Debug/
+BUILD_DIR = bin/Debug
 
 RTMNET_DLL_MDB_SOURCE=bin/Debug/RtmNet.dll.mdb
 RTMNET_DLL_MDB=$(BUILD_DIR)/RtmNet.dll.mdb
 
 endif
 
-if ENABLE_WINDEBUG
-ASSEMBLY_COMPILER_COMMAND = gmcs
+if ENABLE_LINUXDEBUG
+ASSEMBLY_COMPILER_COMMAND = dmcs
 ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG;TRACE"
 ASSEMBLY = bin/Debug/RtmNet.dll
 ASSEMBLY_MDB = $(ASSEMBLY).mdb
 COMPILE_TARGET = library
 PROJECT_REFERENCES = 
-BUILD_DIR = bin/Debug/
+BUILD_DIR = bin/Debug
 
 RTMNET_DLL_MDB_SOURCE=bin/Debug/RtmNet.dll.mdb
 RTMNET_DLL_MDB=$(BUILD_DIR)/RtmNet.dll.mdb
 
 endif
 
-if ENABLE_MACDEBUG
-ASSEMBLY_COMPILER_COMMAND = gmcs
-ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG;TRACE"
-ASSEMBLY = bin/Debug/RtmNet.dll
-ASSEMBLY_MDB = $(ASSEMBLY).mdb
+if ENABLE_LINUXRELEASE
+ASSEMBLY_COMPILER_COMMAND = dmcs
+ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+ "-define:TRACE"
+ASSEMBLY = bin/LinuxRelease/RtmNet.dll
+ASSEMBLY_MDB = 
 COMPILE_TARGET = library
 PROJECT_REFERENCES = 
-BUILD_DIR = bin/Debug/
+BUILD_DIR = bin/LinuxRelease
 
-RTMNET_DLL_MDB_SOURCE=bin/Debug/RtmNet.dll.mdb
-RTMNET_DLL_MDB=$(BUILD_DIR)/RtmNet.dll.mdb
+RTMNET_DLL_MDB=
 
 endif
 
-AL=al2
+AL=al
 SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll
 
-LINUX_PKGCONFIG = \
-	$(RTMNET_PC)  
-
 PROGRAMFILES = \
 	$(RTMNET_DLL_MDB)  
 
 
 RESGEN=resgen2
 	
-all: $(ASSEMBLY) $(LINUX_PKGCONFIG) $(PROGRAMFILES) 
+all: $(ASSEMBLY) $(PROGRAMFILES) 
 
 FILES = \
 	ApiKeyRequiredException.cs \
@@ -97,7 +93,8 @@ FILES = \
 	User.cs \
 	Utils.cs \
 	Properties/AssemblyInfo.cs \
-	../../build/CommonAssemblyInfo.cs 
+	../../build/CommonAssemblyInfo.cs \
+	../../build/GlobalDefines.cs 
 
 DATA_FILES = 
 
@@ -106,8 +103,7 @@ RESOURCES =
 EXTRAS = \
 	example_app.config \
 	License.txt \
-	Properties \
-	rtmnet.pc.in 
+	Properties 
 
 REFERENCES =  \
 	System \
@@ -116,13 +112,11 @@ REFERENCES =  \
 
 DLL_REFERENCES = 
 
-CLEANFILES = $(LINUX_PKGCONFIG) $(PROGRAMFILES) 
+CLEANFILES = $(PROGRAMFILES) 
 
 include $(top_srcdir)/Makefile.include
 
-RTMNET_PC = $(BUILD_DIR)/rtmnet.pc
 
-$(eval $(call emit-deploy-wrapper,RTMNET_PC,rtmnet.pc))
 
 
 $(eval $(call emit_resgen_targets))
diff --git a/src/libtasque/Makefile.am b/src/libtasque/Makefile.am
index 877edb3..3a87fa6 100644
--- a/src/libtasque/Makefile.am
+++ b/src/libtasque/Makefile.am
@@ -16,9 +16,9 @@ LIBTASQUE_DLL_MDB=
 
 endif
 
-if ENABLE_LINUXDEBUG
+if ENABLE_DEBUG
 ASSEMBLY_COMPILER_COMMAND = dmcs
-ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG"
+ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG;TRACE"
 ASSEMBLY = bin/Debug/libtasque.dll
 ASSEMBLY_MDB = $(ASSEMBLY).mdb
 COMPILE_TARGET = library
@@ -30,9 +30,9 @@ LIBTASQUE_DLL_MDB=$(BUILD_DIR)/libtasque.dll.mdb
 
 endif
 
-if ENABLE_WINDEBUG
+if ENABLE_LINUXDEBUG
 ASSEMBLY_COMPILER_COMMAND = dmcs
-ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG"
+ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG;TRACE"
 ASSEMBLY = bin/Debug/libtasque.dll
 ASSEMBLY_MDB = $(ASSEMBLY).mdb
 COMPILE_TARGET = library
@@ -44,33 +44,29 @@ LIBTASQUE_DLL_MDB=$(BUILD_DIR)/libtasque.dll.mdb
 
 endif
 
-if ENABLE_MACDEBUG
+if ENABLE_LINUXRELEASE
 ASSEMBLY_COMPILER_COMMAND = dmcs
-ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG"
-ASSEMBLY = bin/Debug/libtasque.dll
-ASSEMBLY_MDB = $(ASSEMBLY).mdb
+ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize-
+ASSEMBLY = bin/LinuxRelease/libtasque.dll
+ASSEMBLY_MDB = 
 COMPILE_TARGET = library
 PROJECT_REFERENCES = 
-BUILD_DIR = bin/Debug
+BUILD_DIR = bin/LinuxRelease
 
-LIBTASQUE_DLL_MDB_SOURCE=bin/Debug/libtasque.dll.mdb
-LIBTASQUE_DLL_MDB=$(BUILD_DIR)/libtasque.dll.mdb
+LIBTASQUE_DLL_MDB=
 
 endif
 
 AL=al
 SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll
 
-LINUX_PKGCONFIG = \
-	$(LIBTASQUE_PC)  
-
 PROGRAMFILES = \
 	$(LIBTASQUE_DLL_MDB)  
 
 
 RESGEN=resgen2
 	
-all: $(ASSEMBLY) $(LINUX_PKGCONFIG) $(PROGRAMFILES) 
+all: $(ASSEMBLY) $(PROGRAMFILES) 
 
 FILES = \
 	IBackend.cs \
@@ -98,7 +94,8 @@ FILES = \
 	DateFormatters/DateSeparatedFormatter.cs \
 	INativeApplication.cs \
 	Properties/AssemblyInfo.cs \
-	../../build/CommonAssemblyInfo.cs 
+	../../build/CommonAssemblyInfo.cs \
+	../../build/GlobalDefines.cs 
 
 DATA_FILES = 
 
@@ -106,24 +103,22 @@ RESOURCES =
 
 EXTRAS = \
 	DateFormatters \
-	Properties \
-	libtasque.pc.in 
+	Properties 
 
 REFERENCES =  \
 	$(GTK_SHARP_20_LIBS) \
 	System \
 	System.Core \
-	Mono.Posix
+	Mono.Posix \
+	$(GLIB_SHARP_20_LIBS)
 
 DLL_REFERENCES = 
 
-CLEANFILES = $(LINUX_PKGCONFIG) $(PROGRAMFILES) 
+CLEANFILES = $(PROGRAMFILES) 
 
 include $(top_srcdir)/Makefile.include
 
-LIBTASQUE_PC = $(BUILD_DIR)/libtasque.pc
 
-$(eval $(call emit-deploy-wrapper,LIBTASQUE_PC,libtasque.pc))
 
 
 $(eval $(call emit_resgen_targets))
diff --git a/src/tasque/Makefile.am b/src/tasque/Makefile.am
index 505b317..279f25c 100644
--- a/src/tasque/Makefile.am
+++ b/src/tasque/Makefile.am
@@ -12,65 +12,76 @@ COMPILE_TARGET = winexe
 PROJECT_REFERENCES =  \
 	../libtasque/bin/Release/libtasque.dll \
 	../RtmNet/bin/Release/RtmNet.dll
-BUILD_DIR = bin/Release/
+BUILD_DIR = bin/Release
 
 LIBTASQUE_DLL_SOURCE=../libtasque/bin/Release/libtasque.dll
 RTMNET_DLL_SOURCE=../RtmNet/bin/Release/RtmNet.dll
 TASQUE_EXE_MDB=
+LIBTASQUE_DLL_MDB=
+RTMNET_DLL_MDB=
 
 endif
 
-if ENABLE_LINUXDEBUG
+if ENABLE_DEBUG
 ASSEMBLY_COMPILER_COMMAND = dmcs
-ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:TRACE;DEBUG;ENABLE_NOTIFY_SHARP"
+ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG;TRACE"
 ASSEMBLY = bin/Debug/tasque.exe
 ASSEMBLY_MDB = $(ASSEMBLY).mdb
 COMPILE_TARGET = winexe
 PROJECT_REFERENCES =  \
 	../libtasque/bin/Debug/libtasque.dll \
 	../RtmNet/bin/Debug/RtmNet.dll
-BUILD_DIR = bin/Debug/
+BUILD_DIR = bin/Debug
 
 LIBTASQUE_DLL_SOURCE=../libtasque/bin/Debug/libtasque.dll
 RTMNET_DLL_SOURCE=../RtmNet/bin/Debug/RtmNet.dll
 TASQUE_EXE_MDB_SOURCE=bin/Debug/tasque.exe.mdb
 TASQUE_EXE_MDB=$(BUILD_DIR)/tasque.exe.mdb
+LIBTASQUE_DLL_MDB_SOURCE=../libtasque/bin/Debug/libtasque.dll.mdb
+LIBTASQUE_DLL_MDB=$(BUILD_DIR)/libtasque.dll.mdb
+RTMNET_DLL_MDB_SOURCE=../RtmNet/bin/Debug/RtmNet.dll.mdb
+RTMNET_DLL_MDB=$(BUILD_DIR)/RtmNet.dll.mdb
 
 endif
 
-if ENABLE_WINDEBUG
+if ENABLE_LINUXDEBUG
 ASSEMBLY_COMPILER_COMMAND = dmcs
-ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:TRACE;DEBUG;WIN32"
+ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG;TRACE"
 ASSEMBLY = bin/Debug/tasque.exe
 ASSEMBLY_MDB = $(ASSEMBLY).mdb
 COMPILE_TARGET = winexe
 PROJECT_REFERENCES =  \
 	../libtasque/bin/Debug/libtasque.dll \
 	../RtmNet/bin/Debug/RtmNet.dll
-BUILD_DIR = bin/Debug/
+BUILD_DIR = bin/Debug
 
 LIBTASQUE_DLL_SOURCE=../libtasque/bin/Debug/libtasque.dll
 RTMNET_DLL_SOURCE=../RtmNet/bin/Debug/RtmNet.dll
 TASQUE_EXE_MDB_SOURCE=bin/Debug/tasque.exe.mdb
 TASQUE_EXE_MDB=$(BUILD_DIR)/tasque.exe.mdb
+LIBTASQUE_DLL_MDB_SOURCE=../libtasque/bin/Debug/libtasque.dll.mdb
+LIBTASQUE_DLL_MDB=$(BUILD_DIR)/libtasque.dll.mdb
+RTMNET_DLL_MDB_SOURCE=../RtmNet/bin/Debug/RtmNet.dll.mdb
+RTMNET_DLL_MDB=$(BUILD_DIR)/RtmNet.dll.mdb
 
 endif
 
-if ENABLE_MACDEBUG
+if ENABLE_LINUXRELEASE
 ASSEMBLY_COMPILER_COMMAND = dmcs
-ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:TRACE;DEBUG;OSX"
-ASSEMBLY = bin/Debug/tasque.exe
-ASSEMBLY_MDB = $(ASSEMBLY).mdb
+ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+ "-define:TRACE"
+ASSEMBLY = bin/LinuxRelease/tasque.exe
+ASSEMBLY_MDB = 
 COMPILE_TARGET = winexe
 PROJECT_REFERENCES =  \
-	../libtasque/bin/Debug/libtasque.dll \
-	../RtmNet/bin/Debug/RtmNet.dll
-BUILD_DIR = bin/Debug/
+	../libtasque/bin/LinuxRelease/libtasque.dll \
+	../RtmNet/bin/LinuxRelease/RtmNet.dll
+BUILD_DIR = bin/LinuxRelease
 
-LIBTASQUE_DLL_SOURCE=../libtasque/bin/Debug/libtasque.dll
-RTMNET_DLL_SOURCE=../RtmNet/bin/Debug/RtmNet.dll
-TASQUE_EXE_MDB_SOURCE=bin/Debug/tasque.exe.mdb
-TASQUE_EXE_MDB=$(BUILD_DIR)/tasque.exe.mdb
+LIBTASQUE_DLL_SOURCE=../libtasque/bin/LinuxRelease/libtasque.dll
+RTMNET_DLL_SOURCE=../RtmNet/bin/LinuxRelease/RtmNet.dll
+TASQUE_EXE_MDB=
+LIBTASQUE_DLL_MDB=
+RTMNET_DLL_MDB=
 
 endif
 
@@ -80,7 +91,9 @@ SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll
 PROGRAMFILES = \
 	$(LIBTASQUE_DLL) \
 	$(RTMNET_DLL) \
-	$(TASQUE_EXE_MDB)  
+	$(TASQUE_EXE_MDB) \
+	$(LIBTASQUE_DLL_MDB) \
+	$(RTMNET_DLL_MDB)  
 
 BINARIES = \
 	$(TASQUE)  
@@ -91,12 +104,12 @@ RESGEN=resgen2
 all: $(ASSEMBLY) $(PROGRAMFILES) $(BINARIES) 
 
 FILES = \
-	Defines.WIN32.cs \
 	RemoteControl.cs \
 	RemoteControlProxy.cs \
 	GnomeApplication.cs \
 	Properties/AssemblyInfo.cs \
 	../../build/CommonAssemblyInfo.cs \
+	../../build/GlobalDefines.cs \
 	AbstractTask.cs \
 	AllCategory.cs \
 	Application.cs \
@@ -143,41 +156,48 @@ FILES = \
 
 DATA_FILES = 
 
-RESOURCES = 
+RESOURCES = \
+	../../data/icons/hicolor_actions_22x22_notebook.png \
+	../../data/icons/hicolor_actions_22x22_notebook.svg \
+	../../data/icons/hicolor_animations_16x16_countdown-1.png \
+	../../data/icons/hicolor_animations_16x16_countdown-10.png \
+	../../data/icons/hicolor_animations_16x16_countdown-11.png \
+	../../data/icons/hicolor_animations_16x16_countdown-12.png \
+	../../data/icons/hicolor_animations_16x16_countdown-12.svg \
+	../../data/icons/hicolor_animations_16x16_countdown-2.png \
+	../../data/icons/hicolor_animations_16x16_countdown-3.png \
+	../../data/icons/hicolor_animations_16x16_countdown-4.png \
+	../../data/icons/hicolor_animations_16x16_countdown-5.png \
+	../../data/icons/hicolor_animations_16x16_countdown-6.png \
+	../../data/icons/hicolor_animations_16x16_countdown-7.png \
+	../../data/icons/hicolor_animations_16x16_countdown-8.png \
+	../../data/icons/hicolor_animations_16x16_countdown-9.png \
+	../../data/icons/rtmLogo.png \
+	../../data/icons/tasque.ico \
+	../../data/icons/tasque.svg \
+	../../data/icons/tasque-16.png \
+	../../data/icons/tasque-22.png \
+	../../data/icons/tasque-24.png \
+	../../data/icons/tasque-256.png \
+	../../data/icons/tasque-32.png \
+	../../data/icons/tasque-48.png \
+	../../data/icons/tasque-icons-source.svg \
+	../../data/icons/tasque-opensuse-1click.png 
 
 EXTRAS = \
-	res/tasque-opensuse-1click.png \
-	res/images/clock-16-0.png \
-	res/images/clock-16-0.svg \
-	res/images/clock-16-1.png \
-	res/images/clock-16-10.png \
-	res/images/clock-16-11.png \
-	res/images/clock-16-2.png \
-	res/images/clock-16-3.png \
-	res/images/clock-16-4.png \
-	res/images/clock-16-5.png \
-	res/images/clock-16-6.png \
-	res/images/clock-16-7.png \
-	res/images/clock-16-8.png \
-	res/images/clock-16-9.png \
-	res/images/note-16.png \
-	res/images/note-22.svg \
-	res/images/rtmLogo.png \
-	res/images/tasque-16.png \
-	res/images/tasque-22.png \
-	res/images/tasque-24.png \
-	res/images/tasque-256.png \
-	res/images/tasque-32.png \
-	res/images/tasque-48.png \
-	res/images/tasque-icons-source.svg \
-	res/images/tasque.ico \
-	res/images/tasque.svg \
-	res/osx/Contents/Info.plist \
-	res/osx/Contents/MacOS/Tasque \
-	res/osx/Contents/Resources/tasque.icns \
-	res/sounds/notify.wav \
+	../../data/osx/Contents/Info.plist \
+	../../data/osx/Contents/MacOS/Tasque \
+	../../data/osx/Contents/Resources/tasque.icns \
+	../../data/sounds/notify.wav \
 	OSXApplication.cs \
 	Properties \
+	data \
+	data/icons \
+	data/osx \
+	data/sounds \
+	data/osx/Contents \
+	data/osx/Contents/MacOS \
+	data/osx/Contents/Resources \
 	tasque.in 
 
 REFERENCES =  \
@@ -206,6 +226,8 @@ TASQUE = $(BUILD_DIR)/tasque
 $(eval $(call emit-deploy-target,LIBTASQUE_DLL))
 $(eval $(call emit-deploy-target,RTMNET_DLL))
 $(eval $(call emit-deploy-wrapper,TASQUE,tasque,x))
+$(eval $(call emit-deploy-target,LIBTASQUE_DLL_MDB))
+$(eval $(call emit-deploy-target,RTMNET_DLL_MDB))
 
 
 $(eval $(call emit_resgen_targets))
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1813722..cb1839f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,71 +5,71 @@ EXTRA_DIST =
 
 if ENABLE_RELEASE
 ASSEMBLY_COMPILER_COMMAND = dmcs
-ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize-
-ASSEMBLY = bin/Release/tasque.tests.dll
-ASSEMBLY_MDB = 
+ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG;TRACE"
+ASSEMBLY = bin/Debug/tests.dll
+ASSEMBLY_MDB = $(ASSEMBLY).mdb
 COMPILE_TARGET = library
 PROJECT_REFERENCES =  \
 	../src/libtasque/bin/Release/libtasque.dll
-BUILD_DIR = bin/Release
+BUILD_DIR = bin/Debug
 
-LIBTASQUE_DLL_SOURCE=../src/libtasque/bin/Release/libtasque.dll
-TASQUE_TESTS_DLL_MDB=
-LIBTASQUE_DLL_MDB=
+TESTS_DLL_MDB_SOURCE=bin/Debug/tests.dll.mdb
+TESTS_DLL_MDB=$(BUILD_DIR)/tests.dll.mdb
+LIBTASQUE_DLL_SOURCE=../src/libtasque/bin/Debug/libtasque.dll
+LIBTASQUE_DLL_MDB_SOURCE=../src/libtasque/bin/Debug/libtasque.dll.mdb
+LIBTASQUE_DLL_MDB=$(BUILD_DIR)/libtasque.dll.mdb
 
 endif
 
-if ENABLE_LINUXDEBUG
+if ENABLE_DEBUG
 ASSEMBLY_COMPILER_COMMAND = dmcs
-ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG"
-ASSEMBLY = bin/Debug/tasque.tests.dll
+ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG;TRACE"
+ASSEMBLY = bin/Debug/tests.dll
 ASSEMBLY_MDB = $(ASSEMBLY).mdb
 COMPILE_TARGET = library
 PROJECT_REFERENCES =  \
 	../src/libtasque/bin/Debug/libtasque.dll
 BUILD_DIR = bin/Debug
 
+TESTS_DLL_MDB_SOURCE=bin/Debug/tests.dll.mdb
+TESTS_DLL_MDB=$(BUILD_DIR)/tests.dll.mdb
 LIBTASQUE_DLL_SOURCE=../src/libtasque/bin/Debug/libtasque.dll
-TASQUE_TESTS_DLL_MDB_SOURCE=bin/Debug/tasque.tests.dll.mdb
-TASQUE_TESTS_DLL_MDB=$(BUILD_DIR)/tasque.tests.dll.mdb
 LIBTASQUE_DLL_MDB_SOURCE=../src/libtasque/bin/Debug/libtasque.dll.mdb
 LIBTASQUE_DLL_MDB=$(BUILD_DIR)/libtasque.dll.mdb
 
 endif
 
-if ENABLE_WINDEBUG
+if ENABLE_LINUXDEBUG
 ASSEMBLY_COMPILER_COMMAND = dmcs
-ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG"
-ASSEMBLY = bin/Debug/tasque.tests.dll
+ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG;TRACE"
+ASSEMBLY = bin/Debug/tests.dll
 ASSEMBLY_MDB = $(ASSEMBLY).mdb
 COMPILE_TARGET = library
 PROJECT_REFERENCES =  \
 	../src/libtasque/bin/Debug/libtasque.dll
 BUILD_DIR = bin/Debug
 
+TESTS_DLL_MDB_SOURCE=bin/Debug/tests.dll.mdb
+TESTS_DLL_MDB=$(BUILD_DIR)/tests.dll.mdb
 LIBTASQUE_DLL_SOURCE=../src/libtasque/bin/Debug/libtasque.dll
-TASQUE_TESTS_DLL_MDB_SOURCE=bin/Debug/tasque.tests.dll.mdb
-TASQUE_TESTS_DLL_MDB=$(BUILD_DIR)/tasque.tests.dll.mdb
 LIBTASQUE_DLL_MDB_SOURCE=../src/libtasque/bin/Debug/libtasque.dll.mdb
 LIBTASQUE_DLL_MDB=$(BUILD_DIR)/libtasque.dll.mdb
 
 endif
 
-if ENABLE_MACDEBUG
+if ENABLE_LINUXRELEASE
 ASSEMBLY_COMPILER_COMMAND = dmcs
-ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG"
-ASSEMBLY = bin/Debug/tasque.tests.dll
-ASSEMBLY_MDB = $(ASSEMBLY).mdb
+ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize-
+ASSEMBLY = bin/LinuxRelease/tests.dll
+ASSEMBLY_MDB = 
 COMPILE_TARGET = library
 PROJECT_REFERENCES =  \
-	../src/libtasque/bin/Debug/libtasque.dll
-BUILD_DIR = bin/Debug
+	../src/libtasque/bin/LinuxRelease/libtasque.dll
+BUILD_DIR = bin/LinuxRelease
 
-LIBTASQUE_DLL_SOURCE=../src/libtasque/bin/Debug/libtasque.dll
-TASQUE_TESTS_DLL_MDB_SOURCE=bin/Debug/tasque.tests.dll.mdb
-TASQUE_TESTS_DLL_MDB=$(BUILD_DIR)/tasque.tests.dll.mdb
-LIBTASQUE_DLL_MDB_SOURCE=../src/libtasque/bin/Debug/libtasque.dll.mdb
-LIBTASQUE_DLL_MDB=$(BUILD_DIR)/libtasque.dll.mdb
+TESTS_DLL_MDB=
+LIBTASQUE_DLL_SOURCE=../src/libtasque/bin/LinuxRelease/libtasque.dll
+LIBTASQUE_DLL_MDB=
 
 endif
 
@@ -77,8 +77,8 @@ AL=al
 SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll
 
 PROGRAMFILES = \
+	$(TESTS_DLL_MDB) \
 	$(LIBTASQUE_DLL) \
-	$(TASQUE_TESTS_DLL_MDB) \
 	$(LIBTASQUE_DLL_MDB)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]