[tasque/restructure: 5/17] [repo] Clean up and format nicely

[Antonius Riha <antoniusri src gnome org>]

commit 8f4302c60fb3e9c945be3b5e07390056c09b4fa8
Author: Antonius Riha <antoniusriha gmail com>
Date:   Sat Aug 25 22:51:09 2012 +0200

    [repo] Clean up and format nicely

 Makefile.am                             |    3 -
 configure.ac                            |    6 ---
 src/Addins/Backends/IceCore/Makefile.am |   56 +++++++++++-------------
 src/Libraries/RtmNet/Makefile.am        |   71 +++++++++++++------------------
 src/libtasque/Makefile.am               |   12 +----
 src/tasque/Makefile.am                  |   30 +++++++-------
 6 files changed, 73 insertions(+), 105 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 4a7dc32..c45b13b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,9 +24,6 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --disable-scrollkeeper
 # Ignore scrollkeeper issues for now.  @#*$& scrollkeeper (from Evince)
 distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper | grep -v /share/gnome/help/ | grep -v \.omf
 
-run: $(PROGRAM)
-	cd src && ./tasque
-
 dist-hook:
 	@if test -d "$(srcdir)/.git"; \
 	then \
diff --git a/configure.ac b/configure.ac
index 27ad969..f150fe1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -263,11 +263,6 @@ data/sounds/Makefile
 po/Makefile.in
 ])
 
-#./src/Backends/Dummy/Makefile
-#./src/Backends/EDS/Makefile
-#./src/Backends/Rtm/Makefile
-#./src/Backends/Sqlite/Makefile
-
 AC_OUTPUT
 
 echo "
@@ -284,4 +279,3 @@ Configuration:
 	Hiveminder Backend: ${final_backend_hiveminder}
 	AppIndicator:      ${appindicator}
 "
-
diff --git a/src/Addins/Backends/IceCore/Makefile.am b/src/Addins/Backends/IceCore/Makefile.am
index 9fbaf27..28a18a7 100644
--- a/src/Addins/Backends/IceCore/Makefile.am
+++ b/src/Addins/Backends/IceCore/Makefile.am
@@ -1,45 +1,41 @@
-include $(top_srcdir)/Makefile.include
+CSC = $(DMCS)
 
-CSFLAGS = 		\
-	-debug 		\
-	-define:DEBUG 	\
-	-target:library
+CSFILES = *.cs
 
-ASSMS = \
-	-r:$(top_builddir)/src/Tasque.exe \
+ASSEMBLIES = \
+	-r:../../../libtasque/libtasque.dll \
+	-r:../../../tasque/Tasque.exe \
+	-r:System \
+	-r:System.Xml \
+	-r:Mono.Posix \
 	$(GLIB_SHARP_20_LIBS) \
 	$(GNOME_SHARP_20_LIBS) \
 	$(GTK_DOTNET_20_LIBS) \
 	$(ICE_DESKTOP_LIBS) \
 	$(NDESK_DBUS_10_LIBS) \
-	$(NDESK_DBUS_GLIB_10_LIBS) \
-	-r:System \
-	-r:Mono.Posix
-	-r:System.xml
-
-BACKEND_NAME = IceCore.Backend
-CSFILES = \
-	IceBackend.cs \
-	IceCategory.cs \
-	IceNote.cs \
-	IceTask.cs
+	$(NDESK_DBUS_GLIB_10_LIBS)
 
 if ENABLE_BACKEND_ICECORE
-TARGET = $(BACKEND_NAME).dll
-RESOURCES =
 
-$(TARGET): $(CSFILES) $(top_builddir)/src/Tasque.exe
-	$(CSC) -out:$@ $(CSFLAGS) $(ASSMS) $(CSFILES) $(RESOURCES)
+TARGET = IceCoreBackend.dll
+
+if ENABLE_DEBUG
+CSFLAGS = -debug -d:DEBUG
+MDBFILES = $(TARGET).mdb
+endif
+
+$(TARGET): $(CSFILES)
+	$(CSC) -out:$@ -t:library -noconfig -codepage:utf8 -warn:4 $(CSFLAGS) $^ $(ASSEMBLIES)
+	
+$(TARGET).mdb: $(TARGET)
+
 endif
 
-backendsdir = $(pkglibdir)
-backends_DATA = 		\
-	$(TARGET)
+tasquelibdir = $(libdir)/tasque
+tasquelib_DATA = $(TARGET) $(MDBFILES)
 
-EXTRA_DIST =            	\
-	$(CSFILES)
+EXTRA_DIST = $(CSFILES)
 
-CLEANFILES =				\
-	$(TARGET).mdb \
-	$(TARGET)
+CLEANFILES = $(TARGET) $(TARGET).mdb
 
+DISTCLEANFILES = $(TARGET) $(TARGET).mdb
diff --git a/src/Libraries/RtmNet/Makefile.am b/src/Libraries/RtmNet/Makefile.am
index 8c25ea8..7e1d38f 100644
--- a/src/Libraries/RtmNet/Makefile.am
+++ b/src/Libraries/RtmNet/Makefile.am
@@ -8,57 +8,44 @@ MDBFILES = $(TARGET).mdb
 endif
 
 CSFILES = \
-	ApiKeyRequiredException.cs		\
-	AssemblyInfo.cs			\
-	Auth.cs				\
-	AuthenticationRequiredException.cs	\
-	Categories.cs				\
-	Contacts.cs				\
-	DateGranularity.cs			\
-	Enums.cs				\
-	Groups.cs				\
-	GroupSearchResults.cs			\
-	HttpUtility.cs			\
-	List.cs				\
-	Methods.cs				\
-	Note.cs				\
-	Response.cs				\
-	ResponseXmlException.cs		\
-	RtmApiException.cs			\
-	Rtm.cs				\
-	RtmException.cs			\
-	RtmWebException.cs			\
-	SignatureRequiredException.cs		\
-	Tags.cs				\
-	Task.cs				\
-	User.cs				\
+	ApiKeyRequiredException.cs \
+	AssemblyInfo.cs \
+	Auth.cs \
+	AuthenticationRequiredException.cs \
+	Categories.cs \
+	Contacts.cs \
+	DateGranularity.cs \
+	Enums.cs \
+	Groups.cs \
+	GroupSearchResults.cs \
+	HttpUtility.cs \
+	List.cs \
+	Methods.cs \
+	Note.cs \
+	Response.cs \
+	ResponseXmlException.cs \
+	RtmApiException.cs \
+	Rtm.cs \
+	RtmException.cs \
+	RtmWebException.cs \
+	SignatureRequiredException.cs \
+	Tags.cs \
+	Task.cs \
+	User.cs \
 	Utils.cs
 
-
-RESOURCES = 
-
-ASSEMBLIES =  \
-	-r:System \
-	-r:System.Xml
+ASSEMBLIES = -r:System -r:System.Xml
 
 $(TARGET): $(CSFILES)
-	$(CSC) -unsafe -out:$@ -t:library -noconfig -codepage:utf8 -warn:4 $(CSFLAGS) $^ $(ASSEMBLIES) $(RESOURCES)
+	$(CSC) -out:$@ -t:library -noconfig -codepage:utf8 -warn:4 $(CSFLAGS) $^ $(ASSEMBLIES)
 
 $(TARGET).mdb: $(TARGET)
 
 tasquelibdir = $(libdir)/tasque
 tasquelib_DATA = $(TARGET) $(MDBFILES)
 
-bin_SCRIPTS = $(WRAPPER)
-
-
-EXTRA_DIST = \
-	$(CSFILES)
+EXTRA_DIST = $(CSFILES)
 
-CLEANFILES = \
-	$(TARGET)					\
-	$(TARGET).mdb
+CLEANFILES = $(TARGET) $(TARGET).mdb
 
-DISTCLEANFILES =                        \
-	$(TARGET)			\
-	$(TARGET).mdb
+DISTCLEANFILES = $(TARGET) $(TARGET).mdb
diff --git a/src/libtasque/Makefile.am b/src/libtasque/Makefile.am
index 21d5110..7f105f5 100644
--- a/src/libtasque/Makefile.am
+++ b/src/libtasque/Makefile.am
@@ -47,14 +47,8 @@ tasquelib_DATA = $(TARGET) $(MDBFILES)
 
 $(TARGET).mdb: $(TARGET)
 
-EXTRA_DIST = \
-	$(CSFILES) \
-	libtasque.csproj
+EXTRA_DIST = $(CSFILES) libtasque.csproj
 
-CLEANFILES = \
-	$(TARGET) \
-	$(TARGET).mdb
+CLEANFILES = $(TARGET) $(TARGET).mdb
 
-DISTCLEANFILES = \
-	$(TARGET) \
-	$(TARGET).mdb
+DISTCLEANFILES = $(TARGET) $(TARGET).mdb
diff --git a/src/tasque/Makefile.am b/src/tasque/Makefile.am
index 5a8bd69..f09961a 100644
--- a/src/tasque/Makefile.am
+++ b/src/tasque/Makefile.am
@@ -70,7 +70,7 @@ RESOURCES = \
 	-resource:$(top_srcdir)/data/images/clock-16-10.png \
 	-resource:$(top_srcdir)/data/images/clock-16-11.png
 
-ASSEMBLIES =  \
+ASSEMBLIES = \
 	-r:System \
 	-r:System.Core \
 	-r:Mono.Posix \
@@ -118,26 +118,26 @@ Defines.cs: Defines.cs.in Makefile
 		< $< > $@
 
 EXTRA_DIST = \
-	$(CSFILES)					\
-	$(WRAPPER).in				\
-	$(TARGET).config.in		\
-	Defines.cs.in		\
-	tasque.pc.in		\
+	$(CSFILES) \
+	$(WRAPPER).in \
+	$(TARGET).config.in \
+	Defines.cs.in \
+	tasque.pc.in \
 	OSXApplication.cs
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = tasque.pc
 
 CLEANFILES = \
-	$(TARGET)					\
-	$(TARGET).config	\
-	$(TARGET).mdb				\
-	$(WRAPPER)					\
+	$(TARGET) \
+	$(TARGET).config \
+	$(TARGET).mdb \
+	$(WRAPPER) \
 	Defines.cs
 
-DISTCLEANFILES =                        \
-        $(WRAPPER)			\
-	$(TARGET)			\
-	$(TARGET).config	\
-	$(TARGET).mdb		\
+DISTCLEANFILES = \
+    $(WRAPPER) \
+	$(TARGET) \
+	$(TARGET).config \
+	$(TARGET).mdb \
 	Defines.cs