GNOME.org
 

[smuxi/stable] Build: fix make distcheck

commit f5ce4fbd751b72eefc8450be159766e852ebd9f7
Author: Mirco Bauer <meebey meebey net>
Date:   Thu Jan 28 21:46:06 2016 +0100

    Build: fix make distcheck

 src/Common/Makefile.am                 |    2 +-
 src/Engine-Campfire/Makefile.am        |    2 +-
 src/Engine-IRC/Makefile.am             |    2 +-
 src/Engine-JabbR/Makefile.am           |    2 +-
 src/Engine-MessageBuffer/Makefile.am   |    2 +-
 src/Engine-Twitter/Makefile.am         |    3 ++-
 src/Engine-XMPP/Makefile.am            |    2 +-
 src/Engine/Makefile.am                 |    2 +-
 src/Frontend-Curses/Makefile.am        |    2 +-
 src/Frontend-GNOME-IRC/Makefile.am     |    2 +-
 src/Frontend-GNOME-Twitter/Makefile.am |    2 +-
 src/Frontend-GNOME-XMPP/Makefile.am    |    2 +-
 src/Frontend-GNOME/Makefile.am         |   14 +++++++-------
 src/Frontend-STFL/Makefile.am          |    2 +-
 src/Frontend-SWF/Makefile.am           |    2 +-
 src/Frontend-Test/Makefile.am          |    2 +-
 src/Frontend/Makefile.am               |    2 +-
 src/Server/Makefile.am                 |    2 +-
 18 files changed, 25 insertions(+), 24 deletions(-)
---
diff --git a/src/Common/Makefile.am b/src/Common/Makefile.am
index beb8c4f..f4ea269 100644
--- a/src/Common/Makefile.am
+++ b/src/Common/Makefile.am
@@ -46,7 +46,7 @@ LINUX_PKGCONFIG = \
 all: $(ASSEMBLY) $(PROGRAMFILES) $(LINUX_PKGCONFIG)
 
 FILES = \
-       $(top_srcdir)/src/AssemblyVersion.cs \
+       ../AssemblyVersion.cs \
        AssemblyInfo.cs \
        AtomFeed.cs \
        Crc32.cs \
diff --git a/src/Engine-Campfire/Makefile.am b/src/Engine-Campfire/Makefile.am
index 5997a78..7c89dfd 100644
--- a/src/Engine-Campfire/Makefile.am
+++ b/src/Engine-Campfire/Makefile.am
@@ -4,7 +4,7 @@ ASSEMBLY_FILENAME = $(ASSEMBLY_NAME).dll
 ASSEMBLY_TARGET = $(TARGET_DIR)/$(ASSEMBLY_FILENAME)
 
 SOURCES = \
-       $(top_srcdir)/src/AssemblyVersion.cs \
+       ../AssemblyVersion.cs \
        AssemblyInfo.cs \
        Protocols/Campfire/CampfireProtocolManager.cs \
        Protocols/Campfire/CampfirePersonModel.cs \
diff --git a/src/Engine-IRC/Makefile.am b/src/Engine-IRC/Makefile.am
index a75d0b3..9d5220d 100644
--- a/src/Engine-IRC/Makefile.am
+++ b/src/Engine-IRC/Makefile.am
@@ -65,7 +65,7 @@ FILES = \
        Protocols/Irc/IrcPersonModel.cs \
        Protocols/Irc/IrcTextColor.cs \
        Config/IrcServerModel.cs \
-       $(top_srcdir)/src/AssemblyVersion.cs \
+       ../AssemblyVersion.cs \
        AssemblyInfo.cs 
 
 DATA_FILES = 
diff --git a/src/Engine-JabbR/Makefile.am b/src/Engine-JabbR/Makefile.am
index ec57bee..140958e 100644
--- a/src/Engine-JabbR/Makefile.am
+++ b/src/Engine-JabbR/Makefile.am
@@ -4,7 +4,7 @@ ASSEMBLY_FILENAME = $(ASSEMBLY_NAME).dll
 ASSEMBLY_TARGET = $(TARGET_DIR)/$(ASSEMBLY_FILENAME)
 
 SOURCES = \
-       $(top_srcdir)/src/AssemblyVersion.cs \
+       ../AssemblyVersion.cs \
        AssemblyInfo.cs \
        JabbrMessageBuilder.cs \
        JabbrProtocolManager.cs
diff --git a/src/Engine-MessageBuffer/Makefile.am b/src/Engine-MessageBuffer/Makefile.am
index e77185a..b378a53 100644
--- a/src/Engine-MessageBuffer/Makefile.am
+++ b/src/Engine-MessageBuffer/Makefile.am
@@ -7,7 +7,7 @@ ASSEMBLY_CONFIG = $(TARGET_DIR)/$(ASSEMBLY_CONFIG_SOURCE)
 ASSEMBLY_TARGET = $(TARGET_DIR)/$(ASSEMBLY_FILENAME)
 
 SOURCES = \
-       $(top_srcdir)/src/AssemblyVersion.cs \
+       ../AssemblyVersion.cs \
        AssemblyInfo.cs \
        Main.cs
 
diff --git a/src/Engine-Twitter/Makefile.am b/src/Engine-Twitter/Makefile.am
index f476c90..ee35f33 100644
--- a/src/Engine-Twitter/Makefile.am
+++ b/src/Engine-Twitter/Makefile.am
@@ -4,7 +4,8 @@ ASSEMBLY_FILENAME = $(ASSEMBLY_NAME).dll
 ASSEMBLY_TARGET = $(TARGET_DIR)/$(ASSEMBLY_FILENAME)
 #ASSEMBLY_PC = $(top_srcdir)/$(PACKAGE_NAME).pc
 
-SOURCES =      $(top_srcdir)/src/AssemblyVersion.cs \
+SOURCES = \
+               ../AssemblyVersion.cs \
                AssemblyInfo.cs \
                Protocols/Twitter/TwitterProtocolManager.cs \
                Protocols/Twitter/TwitterMessageBuilder.cs \
diff --git a/src/Engine-XMPP/Makefile.am b/src/Engine-XMPP/Makefile.am
index 8fe02c5..c8b02db 100644
--- a/src/Engine-XMPP/Makefile.am
+++ b/src/Engine-XMPP/Makefile.am
@@ -4,7 +4,7 @@ ASSEMBLY_FILENAME = $(ASSEMBLY_NAME).dll
 ASSEMBLY_TARGET = $(TARGET_DIR)/$(ASSEMBLY_FILENAME)
 
 SOURCES = \
-       $(top_srcdir)/src/AssemblyVersion.cs \
+       ../AssemblyVersion.cs \
        AssemblyInfo.cs \
        Config/XmppServerModel.cs \
        Protocols/Xmpp/XmppGroupChatModel.cs \
diff --git a/src/Engine/Makefile.am b/src/Engine/Makefile.am
index e5a0719..f4db4bc 100644
--- a/src/Engine/Makefile.am
+++ b/src/Engine/Makefile.am
@@ -47,7 +47,7 @@ LINUX_PKGCONFIG = \
 all: $(ASSEMBLY) $(PROGRAMFILES) $(LINUX_PKGCONFIG) 
 
 FILES = \
-       $(top_srcdir)/src/AssemblyVersion.cs \
+       ../AssemblyVersion.cs \
        AssemblyInfo.cs \
        CertificateValidator.cs \
        CommandModel.cs \
diff --git a/src/Frontend-Curses/Makefile.am b/src/Frontend-Curses/Makefile.am
index 1251503..b9a9afb 100644
--- a/src/Frontend-Curses/Makefile.am
+++ b/src/Frontend-Curses/Makefile.am
@@ -74,7 +74,7 @@ all: $(ASSEMBLY) $(PROGRAMFILES) $(BINARIES)
 
 FILES = \
        Main.cs \
-       $(top_srcdir)/src/AssemblyVersion.cs \
+       ../AssemblyVersion.cs \
        AssemblyInfo.cs \
        Frontend.cs \
        MainWindow.cs \
diff --git a/src/Frontend-GNOME-IRC/Makefile.am b/src/Frontend-GNOME-IRC/Makefile.am
index eaca695..c0a777d 100644
--- a/src/Frontend-GNOME-IRC/Makefile.am
+++ b/src/Frontend-GNOME-IRC/Makefile.am
@@ -85,7 +85,7 @@ LINUX_PKGCONFIG = \
 all: $(ASSEMBLY) $(PROGRAMFILES) $(LINUX_PKGCONFIG) 
 
 FILES = \
-       $(top_srcdir)/src/AssemblyVersion.cs \
+       ../AssemblyVersion.cs \
        AssemblyInfo.cs \
        IrcGroupChatView.cs \
        IrcPersonChatView.cs \
diff --git a/src/Frontend-GNOME-Twitter/Makefile.am b/src/Frontend-GNOME-Twitter/Makefile.am
index 64a0056..255bb77 100644
--- a/src/Frontend-GNOME-Twitter/Makefile.am
+++ b/src/Frontend-GNOME-Twitter/Makefile.am
@@ -4,7 +4,7 @@ ASSEMBLY_FILENAME = $(ASSEMBLY_NAME).dll
 ASSEMBLY_TARGET = $(TARGET_DIR)/$(ASSEMBLY_FILENAME)
 
 SOURCES = \
-       $(top_srcdir)/src/AssemblyVersion.cs \
+       ../AssemblyVersion.cs \
        AssemblyInfo.cs \
        TwitterGroupChatView.cs
 
diff --git a/src/Frontend-GNOME-XMPP/Makefile.am b/src/Frontend-GNOME-XMPP/Makefile.am
index c70c5cf..213033b 100644
--- a/src/Frontend-GNOME-XMPP/Makefile.am
+++ b/src/Frontend-GNOME-XMPP/Makefile.am
@@ -84,7 +84,7 @@ LINUX_PKGCONFIG = \
 all: $(ASSEMBLY) $(PROGRAMFILES) $(LINUX_PKGCONFIG) 
 
 FILES = \
-       $(top_srcdir)/src/AssemblyVersion.cs \
+       ../AssemblyVersion.cs \
        AssemblyInfo.cs \
        InviteToMenu.cs \
        XmppGroupChatView.cs \
diff --git a/src/Frontend-GNOME/Makefile.am b/src/Frontend-GNOME/Makefile.am
index 646e668..607ba44 100644
--- a/src/Frontend-GNOME/Makefile.am
+++ b/src/Frontend-GNOME/Makefile.am
@@ -117,7 +117,7 @@ $(top_builddir)/images/256/$(PERSON_CHAT_ICON_NAME).png:
        $(INSTALL) -D -m644 $(top_srcdir)/images/person-chat_256x256.png $@
 
 FILES = \
-       $(top_srcdir)/src/AssemblyVersion.cs \
+       ../AssemblyVersion.cs \
        AssemblyInfo.cs \
        AboutDialog.cs \
        CrashDialog.cs \
@@ -202,12 +202,12 @@ DATA_FILES = \
 
 RESOURCES = \
        gtk-gui/gui.stetic \
-       $(top_srcdir)/glade/smuxi-frontend-gnome.glade \
-       $(top_srcdir)/images/icon_256x256.png \
-       $(top_srcdir)/images/group-chat_256x256.png \
-       $(top_srcdir)/images/person-chat_256x256.png \
-       $(top_srcdir)/images/protocol-chat_256x256.png \
-       $(top_srcdir)/images/session-chat_256x256.png 
+       $(top_builddir)/glade/smuxi-frontend-gnome.glade \
+       $(top_builddir)/images/icon_256x256.png \
+       $(top_builddir)/images/group-chat_256x256.png \
+       $(top_builddir)/images/person-chat_256x256.png \
+       $(top_builddir)/images/protocol-chat_256x256.png \
+       $(top_builddir)/images/session-chat_256x256.png
 
 EXTRAS = \
        smuxi-frontend-gnome.in \
diff --git a/src/Frontend-STFL/Makefile.am b/src/Frontend-STFL/Makefile.am
index b9a52ea..cea0de0 100644
--- a/src/Frontend-STFL/Makefile.am
+++ b/src/Frontend-STFL/Makefile.am
@@ -44,7 +44,7 @@ all: $(ASSEMBLY) $(PROGRAMFILES) $(BINARIES)
 
 FILES = \
        Main.cs \
-       $(top_srcdir)/src/AssemblyVersion.cs \
+       ../AssemblyVersion.cs \
        AssemblyInfo.cs \
        Frontend.cs \
        MainWindow.cs \
diff --git a/src/Frontend-SWF/Makefile.am b/src/Frontend-SWF/Makefile.am
index 9c8d60d..ed96d49 100644
--- a/src/Frontend-SWF/Makefile.am
+++ b/src/Frontend-SWF/Makefile.am
@@ -71,7 +71,7 @@ all: $(ASSEMBLY) $(PROGRAMFILES) $(BINARIES)
 
 FILES = \
        NotImplementedMessageDialog.cs \
-       $(top_srcdir)/src/AssemblyVersion.cs \
+       ../AssemblyVersion.cs \
        AssemblyInfo.cs \
        MainWindow.Designer.cs \
        MainWindow.cs \
diff --git a/src/Frontend-Test/Makefile.am b/src/Frontend-Test/Makefile.am
index 500191a..dbbd87f 100644
--- a/src/Frontend-Test/Makefile.am
+++ b/src/Frontend-Test/Makefile.am
@@ -61,7 +61,7 @@ BINARIES = \
 all: $(ASSEMBLY) $(PROGRAMFILES) $(BINARIES) 
 
 FILES = \
-       $(top_srcdir)/src/AssemblyVersion.cs \
+       ../AssemblyVersion.cs \
        AssemblyInfo.cs \
        Frontend.cs \
        Main.cs \
diff --git a/src/Frontend/Makefile.am b/src/Frontend/Makefile.am
index 96775e3..788b278 100644
--- a/src/Frontend/Makefile.am
+++ b/src/Frontend/Makefile.am
@@ -59,7 +59,7 @@ LINUX_PKGCONFIG = \
 all: $(ASSEMBLY) $(PROGRAMFILES) $(LINUX_PKGCONFIG) 
 
 FILES = \
-       $(top_srcdir)/src/AssemblyVersion.cs \
+       ../AssemblyVersion.cs \
        AssemblyInfo.cs \
        ChatViewManagerBase.cs \
        ChatViewSyncManager.cs \
diff --git a/src/Server/Makefile.am b/src/Server/Makefile.am
index 4b0091e..fc054d4 100644
--- a/src/Server/Makefile.am
+++ b/src/Server/Makefile.am
@@ -67,7 +67,7 @@ BINARIES = \
 all: $(ASSEMBLY) $(PROGRAMFILES) $(BINARIES) 
 
 FILES = \
-       $(top_srcdir)/src/AssemblyVersion.cs \
+       ../AssemblyVersion.cs \
        AssemblyInfo.cs \
        Main.cs \
        Server.cs
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]