diff options
| author | Alvaro Soliverez <alvaro.soliverez@collabora.co.uk> | 2012-02-23 12:30:48 -0300 |
|---|---|---|
| committer | Alvaro Soliverez <alvaro.soliverez@collabora.co.uk> | 2012-02-27 11:07:20 -0300 |
| commit | 90b96db4e39656a912be0e0bec1b6c90dda750e3 (patch) | |
| tree | 24323bef90ebea5a59b6fa685a61ada2b4100922 | |
| parent | e28b2ced285b015fbee2ea80c9b9f9155494e331 (diff) | |
Fixed linking after salut plugin library refactor
| -rw-r--r-- | salut/Makefile.am | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/salut/Makefile.am b/salut/Makefile.am index 8ec5fa0..ffe3bc2 100644 --- a/salut/Makefile.am +++ b/salut/Makefile.am @@ -16,27 +16,29 @@ ytstenut_salut_la_LIBADD = \ $(TELEPATHY_YTSTENUT_LIBS) \ $(WOCKY_LIBS) +copied_files = \ + ytstenut.c \ + caps-manager.c \ + channel-manager.c \ + utils.c + ytstenut_salut_la_SOURCES = \ - $(top_srcdir)/plugin-base/ytstenut.c \ - $(top_srcdir)/plugin-base/ytstenut.h \ - $(top_srcdir)/plugin-base/caps-manager.c \ - $(top_srcdir)/plugin-base/caps-manager.h \ + $(copied_files) \ status.c \ status.h \ message-channel.c \ - message-channel.h \ - $(top_srcdir)/plugin-base/channel-manager.c \ - $(top_srcdir)/plugin-base/channel-manager.h \ - $(top_srcdir)/plugin-base/utils.c \ - $(top_srcdir)/plugin-base/utils.h + message-channel.h Android.mk: Makefile.am $(BUILT_SOURCES) + for i in $(copied_files); do \ + cp $(top_srcdir)/plugin-base/$$i .; \ + done androgenizer -:PROJECT ytstenut-plugins \ -:SHARED ytstenut-salut -:TAGS eng debug \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ -:SOURCES $(ytstenut_salut_la_SOURCES) \ -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CFLAGS) -I../../wocky \ - -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) -DSALUT \ - -:LDFLAGS $(AM_LDFLAGS) $(ytstenut_salut_la_LIBADD) -ltelepathy-salut \ + -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \ + -:LDFLAGS $(AM_LDFLAGS) $(ytstenut_salut_la_LIBADD) $(SALUT_LIBS) -ltelepathy-salut \ > $@ |