Skip to content

Commit c84e78d

Browse files
author
Eric Butler
committed
Really fix Makefiles this time. Add debian packaging files.
1 parent 8fe98c0 commit c84e78d

25 files changed

+259
-208
lines changed

‎.gitignore

+5-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,8 @@ missing
1616
omf.make
1717
xmldocs.make
1818
build
19-
debian/
19+
debian/stamp*
20+
debian/synapse*
21+
debian/files
22+
debian/synapse/
23+
src/Synapse.QtClient/synapse

‎Makefile.am

+5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@ EXTRA_DIST = expansions.m4 contrib/Hyena.Gui.dll contrib/Mono.Rocks.dll contrib
44
#Warning: This is an automatically generated file, do not edit!
55
if ENABLE_DEBUG
66
SUBDIRS = src/Synapse.Core src/Synapse.Services src/Synapse.Xmpp src/Synapse.UI src/Synapse.QtClient addins
7+
BUILDDIR = build/Debug
78
endif
89
if ENABLE_RELEASE
910
SUBDIRS = src/Synapse.Core src/Synapse.Services src/Synapse.Xmpp src/Synapse.UI src/Synapse.QtClient addins
11+
BUILDDIR = build/Release
1012
endif
13+
14+
run:
15+
cd $(BUILDDIR) && mono --debug Synapse.exe --debug --uninstalled

‎addins/Banshee/Banshee.mdp

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
99
</Configuration>
1010
<Configuration name="Release" ctype="DotNetProjectConfiguration">
11-
<Output directory="bin/Release" assembly="BansheeNowPlayingProvider" />
11+
<Output directory="../../build/Release/addins" assembly="Banshee" />
1212
<Build debugmode="False" target="Library" />
1313
<Execution runwithwarnings="True" consolepause="False" runtime="MsNet" />
1414
<CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
@@ -23,9 +23,9 @@
2323
</Contents>
2424
<References>
2525
<ProjectReference type="Gac" localcopy="False" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
26-
<ProjectReference type="Project" localcopy="False" refto="Synapse.Core" />
27-
<ProjectReference type="Project" localcopy="False" refto="Synapse.Services" />
2826
<ProjectReference type="Assembly" localcopy="False" specificVersion="False" refto="../../contrib/NDesk.DBus.dll" />
27+
<ProjectReference type="Project" localcopy="False" refto="Synapse.Services" />
28+
<ProjectReference type="Project" localcopy="False" refto="Synapse.Core" />
2929
</References>
3030
<Deployment.LinuxDeployData generatePcFile="False" />
3131
<GtkDesignInfo />
@@ -35,7 +35,7 @@
3535
<ResourcesVar Sync="True" Name="RESOURCES" />
3636
<OthersVar />
3737
<GacRefVar Sync="True" Name="REFERENCES" />
38-
<AsmRefVar Sync="True" Name="REFERENCES" />
39-
<ProjectRefVar Sync="True" Name="REFERENCES" />
38+
<AsmRefVar Sync="True" Name="DLL_REFERENCES" />
39+
<ProjectRefVar Sync="True" Name="PROJECT_REFERENCES" />
4040
</MonoDevelop.Autotools.MakefileInfo>
4141
</Project>

‎addins/Banshee/Makefile.am

+6-10
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-
99
ASSEMBLY = ../../build/Debug/addins/Banshee.dll
1010
ASSEMBLY_MDB = $(ASSEMBLY).mdb
1111
COMPILE_TARGET = library
12-
PROJECT_REFERENCES = \
13-
../../build/Debug/Synapse.Core.dll \
12+
PROJECT_REFERENCES = \
1413
../../build/Debug/Synapse.Services.dll
1514
BUILD_DIR = ../../build/Debug/addins
1615

@@ -25,9 +24,8 @@ ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize-
2524
ASSEMBLY = bin/Release/BansheeNowPlayingProvider.dll
2625
ASSEMBLY_MDB =
2726
COMPILE_TARGET = library
28-
PROJECT_REFERENCES = \
29-
../../build/Release/Dragon.Core.dll \
30-
../../build/Release/Dragon.Services.dll
27+
PROJECT_REFERENCES = \
28+
../../build/Release/Synapse.Services.dll
3129
BUILD_DIR = bin/Release
3230

3331
BANSHEE_DLL_MDB=
@@ -45,21 +43,19 @@ RESGEN=resgen2
4543

4644
all: $(ASSEMBLY) $(PROGRAMFILES)
4745

48-
FILES = \
46+
FILES = \
4947
AssemblyInfo.cs \
5048
BansheeNowPlayingProvider.cs \
5149
IPlayerEngineService.cs \
5250
PlayerEvent.cs
5351

5452
DATA_FILES =
5553

56-
RESOURCES = \
57-
Banshee.addin.xml
54+
RESOURCES = Banshee.addin.xml
5855

5956
EXTRAS =
6057

61-
REFERENCES = \
62-
System
58+
REFERENCES = System
6359

6460
DLL_REFERENCES = \
6561
../../contrib/NDesk.DBus.dll

‎addins/Flickr/Flickr.mdp

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
99
</Configuration>
1010
<Configuration name="Release" ctype="DotNetProjectConfiguration">
11-
<Output directory="bin/Release" assembly="Flickr" />
11+
<Output directory="../../build/Release/addins" assembly="Flickr" />
1212
<Build debugmode="False" target="Library" />
1313
<Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
1414
<CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
@@ -22,9 +22,9 @@
2222
<References>
2323
<ProjectReference type="Gac" localcopy="False" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
2424
<ProjectReference type="Gac" localcopy="False" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
25-
<ProjectReference type="Project" localcopy="False" refto="Synapse.UI" />
2625
<ProjectReference type="Gac" localcopy="False" refto="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
2726
<ProjectReference type="Gac" localcopy="False" refto="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
27+
<ProjectReference type="Project" localcopy="False" refto="Synapse.UI" />
2828
</References>
2929
<Deployment.LinuxDeployData generatePcFile="False" />
3030
<GtkDesignInfo />
@@ -34,7 +34,7 @@
3434
<ResourcesVar Sync="True" Name="RESOURCES" />
3535
<OthersVar />
3636
<GacRefVar Sync="True" Name="REFERENCES" />
37-
<AsmRefVar Sync="True" Name="REFERENCES" />
38-
<ProjectRefVar Sync="True" Name="REFERENCES" />
37+
<AsmRefVar Sync="True" Name="DLL_REFERENCES" />
38+
<ProjectRefVar Sync="True" Name="PROJECT_REFERENCES" />
3939
</MonoDevelop.Autotools.MakefileInfo>
4040
</Project>

‎addins/Flickr/Makefile.am

+7-8
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-
99
ASSEMBLY = ../../build/Debug/addins/Flickr.dll
1010
ASSEMBLY_MDB = $(ASSEMBLY).mdb
1111
COMPILE_TARGET = library
12-
PROJECT_REFERENCES = \
12+
PROJECT_REFERENCES = \
1313
../../build/Debug/Synapse.UI.dll
1414
BUILD_DIR = ../../build/Debug/addins
1515

@@ -25,7 +25,7 @@ ASSEMBLY = bin/Release/Flickr.dll
2525
ASSEMBLY_MDB =
2626
COMPILE_TARGET = library
2727
PROJECT_REFERENCES = \
28-
../../src/Synapse.UI/bin/Release/Synapse.dll
28+
../../build/Release/Synapse.UI.dll
2929
BUILD_DIR = bin/Release
3030

3131
FLICKR_DLL_MDB=
@@ -43,22 +43,21 @@ RESGEN=resgen2
4343

4444
all: $(ASSEMBLY) $(PROGRAMFILES)
4545

46-
FILES = \
46+
FILES = \
4747
AssemblyInfo.cs \
4848
FlickrAvatarProvider.cs
4949

5050
DATA_FILES =
5151

52-
RESOURCES = \
53-
Flickr.addin.xml
52+
RESOURCES = Flickr.addin.xml
5453

5554
EXTRAS =
5655

5756
REFERENCES = \
58-
System \
59-
System.Xml \
6057
$(MONO_ADDINS_LIBS) \
61-
System.Web
58+
System \
59+
System.Web \
60+
System.Xml
6261

6362
DLL_REFERENCES =
6463

‎addins/PasteBox/Makefile.am

+8-11
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@ ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-
99
ASSEMBLY = ../../build/Debug/addins/PasteBox.dll
1010
ASSEMBLY_MDB = $(ASSEMBLY).mdb
1111
COMPILE_TARGET = library
12-
PROJECT_REFERENCES = \
12+
PROJECT_REFERENCES = \
1313
../../build/Debug/Synapse.UI.dll \
14-
../../build/Debug/Synapse.Services.dll \
15-
../../build/Debug/Synapse.Core.dll
14+
../../build/Debug/Synapse.Services.dll
1615
BUILD_DIR = ../../build/Debug/addins
1716

1817
PASTEBOX_DLL_MDB_SOURCE=../../build/Debug/addins/PasteBox.dll.mdb
@@ -27,9 +26,8 @@ ASSEMBLY = bin/Release/PasteBox.dll
2726
ASSEMBLY_MDB =
2827
COMPILE_TARGET = library
2928
PROJECT_REFERENCES = \
30-
../../src/Synapse.UI/bin/Release/Synapse.dll \
31-
../../build/Release/Dragon.Services.dll \
32-
../../build/Release/Dragon.Core.dll
29+
../../build/Release/Synapse.UI.dll \
30+
../../build/Release/Synapse.Services.dll
3331
BUILD_DIR = bin/Release
3432

3533
PASTEBOX_DLL_MDB=
@@ -47,7 +45,7 @@ RESGEN=resgen2
4745

4846
all: $(ASSEMBLY) $(PROGRAMFILES)
4947

50-
FILES = \
48+
FILES = \
5149
ActionHandler.cs \
5250
CodePasteFormatter.cs \
5351
IPasteFormatter.cs \
@@ -56,18 +54,17 @@ FILES = \
5654

5755
DATA_FILES =
5856

59-
RESOURCES = \
57+
RESOURCES = \
6058
PasteBox.addin.xml \
6159
SyntaxHighlighter.css \
6260
SyntaxHighlighter.js
6361

6462
EXTRAS =
6563

66-
REFERENCES = \
67-
$(QYOTO_LIBS)
64+
REFERENCES = $(QYOTO_LIBS)
6865

6966
DLL_REFERENCES = \
70-
../../../../../../usr/lib/cli/kdebindings-2.2/qtwebkit.dll
67+
../../../../../../usr/lib/cli/kdebindings-2.2/qtwebkit.dll
7168

7269
CLEANFILES = $(PROGRAMFILES)
7370

‎addins/PasteBox/PasteBox.mdp

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
99
</Configuration>
1010
<Configuration name="Release" ctype="DotNetProjectConfiguration">
11-
<Output directory="bin/Release" assembly="PasteBox" />
11+
<Output directory="../../build/Release/addins" assembly="PasteBox" />
1212
<Build debugmode="False" target="Library" />
1313
<Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
1414
<CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
@@ -39,8 +39,8 @@
3939
<ResourcesVar Sync="True" Name="RESOURCES" />
4040
<OthersVar />
4141
<GacRefVar Sync="True" Name="REFERENCES" />
42-
<AsmRefVar Sync="True" Name="REFERENCES" />
43-
<ProjectRefVar Sync="True" Name="REFERENCES" />
42+
<AsmRefVar Sync="True" Name="DLL_REFERENCES" />
43+
<ProjectRefVar Sync="True" Name="PROJECT_REFERENCES" />
4444
</MonoDevelop.Autotools.MakefileInfo>
4545
<QyotoDesignInfo>
4646
<Forms>

‎addins/Twitter/Makefile.am

+14-16
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@ ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-
99
ASSEMBLY = ../../build/Debug/addins/Twitter.dll
1010
ASSEMBLY_MDB = $(ASSEMBLY).mdb
1111
COMPILE_TARGET = library
12-
PROJECT_REFERENCES = \
13-
../../build/Debug/Synapse.Core.dll \
12+
PROJECT_REFERENCES = \
1413
../../build/Debug/Synapse.Services.dll \
15-
../../build/Debug/Synapse.Xmpp.dll \
16-
../../build/Debug/Synapse.UI.dll
14+
../../build/Debug/Synapse.UI.dll \
15+
../../build/Debug/Synapse.Xmpp.dll
1716
BUILD_DIR = ../../build/Debug/addins
1817

1918
TWITTER_DLL_MDB_SOURCE=../../build/Debug/addins/Twitter.dll.mdb
@@ -27,11 +26,10 @@ ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize-
2726
ASSEMBLY = bin/Release/Twitter.dll
2827
ASSEMBLY_MDB =
2928
COMPILE_TARGET = library
30-
PROJECT_REFERENCES = \
31-
../../build/Release/Dragon.Core.dll \
32-
../../build/Release/Dragon.Services.dll \
33-
../../src/Synapse.Xmpp/bin/Release/Dragon.Core.Xmpp.dll \
34-
../../src/Synapse.UI/bin/Release/Synapse.dll
29+
PROJECT_REFERENCES = \
30+
../../build/Release/Synapse.Services.dll \
31+
../../build/Release/Synapse.UI.dll \
32+
../../build/Release/Synapse.Xmpp.dll
3533
BUILD_DIR = bin/Release
3634

3735
TWITTER_DLL_MDB=
@@ -49,7 +47,7 @@ RESGEN=resgen2
4947

5048
all: $(ASSEMBLY) $(PROGRAMFILES)
5149

52-
FILES = \
50+
FILES = \
5351
gtk-gui/generated.cs \
5452
gtk-gui/Synapse.Addins.TwitterAddin.TwitterAddinPreferencesDialog.cs \
5553
TwitterAddinPreferencesDialog.cs \
@@ -60,7 +58,7 @@ FILES = \
6058

6159
DATA_FILES =
6260

63-
RESOURCES = \
61+
RESOURCES = \
6462
gtk-gui/gui.stetic \
6563
twitm-16.png \
6664
twitm-48.png \
@@ -69,14 +67,14 @@ RESOURCES = \
6967
EXTRAS =
7068

7169
REFERENCES = \
72-
System.Xml \
73-
System.Web \
74-
System \
7570
$(GTK_SHARP_20_LIBS) \
7671
Mono.Posix \
77-
System.Core
72+
System \
73+
System.Core \
74+
System.Web \
75+
System.Xml
7876

79-
DLL_REFERENCES =
77+
DLL_REFERENCES =
8078

8179
CLEANFILES = $(PROGRAMFILES)
8280

‎addins/Twitter/Twitter.mdp

+8-8
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
99
</Configuration>
1010
<Configuration name="Release" ctype="DotNetProjectConfiguration">
11-
<Output directory="bin/Release" assembly="Twitter" />
11+
<Output directory="../../build/Release/addins" assembly="Twitter" />
1212
<Build debugmode="False" target="Library" />
1313
<Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
1414
<CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
@@ -31,16 +31,16 @@
3131
<ProjectReference type="Gac" localcopy="False" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
3232
<ProjectReference type="Gac" localcopy="False" refto="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
3333
<ProjectReference type="Gac" localcopy="False" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
34-
<ProjectReference type="Project" localcopy="False" refto="Synapse.Core" />
35-
<ProjectReference type="Project" localcopy="False" refto="Synapse.Services" />
36-
<ProjectReference type="Project" localcopy="False" refto="Synapse.Xmpp" />
3734
<ProjectReference type="Gac" localcopy="False" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
3835
<ProjectReference type="Gac" localcopy="False" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
3936
<ProjectReference type="Gac" localcopy="False" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
40-
<ProjectReference type="Project" localcopy="False" refto="Synapse.UI" />
4137
<ProjectReference type="Gac" localcopy="False" refto="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
4238
<ProjectReference type="Gac" localcopy="False" refto="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
43-
<ProjectReference type="Gac" localcopy="False" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
39+
<ProjectReference type="Project" localcopy="False" refto="Synapse.Xmpp" />
40+
<ProjectReference type="Project" localcopy="False" refto="Synapse.UI" />
41+
<ProjectReference type="Project" localcopy="False" refto="Synapse.Core" />
42+
<ProjectReference type="Project" localcopy="False" refto="Synapse.Services" />
43+
<ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
4444
</References>
4545
<Deployment.LinuxDeployData generatePcFile="False" />
4646
<GtkDesignInfo />
@@ -50,7 +50,7 @@
5050
<ResourcesVar Sync="True" Name="RESOURCES" />
5151
<OthersVar />
5252
<GacRefVar Sync="True" Name="REFERENCES" />
53-
<AsmRefVar Sync="True" Name="REFERENCES" />
54-
<ProjectRefVar Sync="True" Name="REFERENCES" />
53+
<AsmRefVar Sync="True" Name="DLL_REFERENCES" />
54+
<ProjectRefVar Sync="True" Name="PROJECT_REFERENCES" />
5555
</MonoDevelop.Autotools.MakefileInfo>
5656
</Project>

‎configure.ac

+14-3
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,23 @@ fi
4545

4646

4747
dnl package checks, common for all configs
48-
PKG_CHECK_MODULES([MONO_ADDINS], [mono-addins])
49-
PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0])
48+
PKG_CHECK_MODULES([QYOTO], [qyoto])
49+
AC_SUBST(QYOTO_LIBS)
50+
5051
PKG_CHECK_MODULES([NOTIFY_SHARP], [notify-sharp])
52+
AC_SUBST(NOTIFY_SHARP_LIBS)
53+
5154
PKG_CHECK_MODULES([GLIB_SHARP_20], [glib-sharp-2.0])
55+
AC_SUBST(GLIB_SHARP_20_LIBS)
56+
5257
PKG_CHECK_MODULES([NDESK_DBUS_GLIB_10], [ndesk-dbus-glib-1.0])
53-
PKG_CHECK_MODULES([QYOTO], [qyoto])
58+
AC_SUBST(NDESK_DBUS_GLIB_10_LIBS)
59+
60+
PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0])
61+
AC_SUBST(GTK_SHARP_20_LIBS)
62+
63+
PKG_CHECK_MODULES([MONO_ADDINS], [mono-addins])
64+
AC_SUBST(MONO_ADDINS_LIBS)
5465

5566
dnl package checks, per config
5667

‎debian/changelog

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
synapse (0.1) intrepid; urgency=low
2+
3+
* Initial package.
4+
5+
-- Eric Butler <[email protected]> Mon, 19 Jan 2009 21:23:12 -0800

0 commit comments

Comments
 (0)