summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlvaro Soliverez <alvaro.soliverez@collabora.co.uk>2012-02-27 11:35:57 -0300
committerAlvaro Soliverez <alvaro.soliverez@collabora.co.uk>2012-02-27 11:36:58 -0300
commitaa9bdf2e3da158323676980c85dd27dac4a19193 (patch)
tree1d8b4c05bfdb3d36efada107943de8acb3fdc5c5
parent9764689601f79581a697a04e8df8b8774f5b66f9 (diff)
Copy plugin-base files to salut directory
This is needed because in some platforms (eg Android) the files cannot be compiled twice. Therefore, we copy the files to salut's directory and build there. The copied files are added to .gitignore to prevent those files from being added to the repository
-rw-r--r--.gitignore5
-rw-r--r--salut/Makefile.am3
2 files changed, 8 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 66cee7a..25cd052 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,8 @@ gabble/caps-manager.c
gabble/channel-manager.c
gabble/utils.c
gabble/ytstenut.c
+
+salut/caps-manager.c
+salut/channel-manager.c
+salut/utils.c
+salut/ytstenut.c
diff --git a/salut/Makefile.am b/salut/Makefile.am
index ffe3bc2..0267b4d 100644
--- a/salut/Makefile.am
+++ b/salut/Makefile.am
@@ -16,6 +16,9 @@ ytstenut_salut_la_LIBADD = \
$(TELEPATHY_YTSTENUT_LIBS) \
$(WOCKY_LIBS)
+$(copied_files):
+ cp $(top_srcdir)/plugin-base/$@ .
+
copied_files = \
ytstenut.c \
caps-manager.c \