← Back to branch summary

~noskcaj/ubuntu/trusty/ekiga/ftbfs

« back to all changes in this revision

Viewing changes to lib/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Eugen Dedu, Eugen Dedu, Kilian Krause, Jordi Mallach
  • Date: 2012-10-16 14:47:35 UTC
  • mfrom: (5.1.6)
  • Revision ID: package-import@ubuntu.com-20121016144735-qb93utz05m94nfqp
Tags: 3.9.90-1
http://bugs.debian.org/679255
http://bugs.debian.org/520830
http://bugs.debian.org/670405
http://bugs.debian.org/551844
[ Eugen Dedu ]
* New upstream release (Closes: #679255, #520830, #670405, #551844,
  #617528, #684999, #538738, #530254, #378846, #582157, #545693,
  #689413, #545693)
* Enable support for experimental Jabber/XMPP protocol
* Remove libx264-dev, libavcodec-dev from Build-Deps as they are for
  OPAL library
* Remove fix-linux-gnueabihf-build.patch, unneeded anymore
* Remove unnecessary libsigc++ Build-Dep

[ Kilian Krause ]
* Bump debhelper compat to 9 to use multiarch for dh_auto_configure. Adjust
  build-depends on debhelper to >= 8.1.3
* debian/rules: make clean target somewhat more ignorant on missing
  build-deps
* Add libx264-dev, libavcodec-dev and libloudmouth1-dev to Build-Deps as
  OPAL has now support for H.263+ and H.264

[ Jordi Mallach ]
* Watch for .xz tarballs, and don't uupdate.
* Merge and acknowledge Héctor Orón's 3.2.7-4.1 NMU in unstable, thanks!
* Refresh fix-linux-gnueabihf-build.patch.
* Update Vcs-Svn URL.
* Drop debian/patches/configure.ac_languages_fix.patch, fixed upstream.
* Drop support for dh-autoreconf, as it's not needed anymore.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/Makefile.am
17
17
        -I$(top_srcdir)/lib \
18
18
        -I$(top_srcdir)/lib/gmconf \
19
19
        -I$(top_srcdir)/lib/gui \
20
 
        -I$(top_srcdir)/lib/toolbox \
21
20
        -I$(top_srcdir)/lib/engine \
22
21
        -I$(top_srcdir)/lib/engine/account \
23
22
        -I$(top_srcdir)/lib/engine/addressbook \
35
34
        -I$(top_srcdir)/lib/engine/protocol \
36
35
        -I$(top_srcdir)/lib/engine/videoinput \
37
36
        -I$(top_srcdir)/lib/engine/videooutput \
38
 
        -I$(top_srcdir)/lib/engine/components/avahi \
39
 
        -I$(top_srcdir)/lib/engine/components/avahi-publisher \
40
37
        -I$(top_srcdir)/lib/engine/components/call-history \
41
38
        -I$(top_srcdir)/lib/engine/components/common-videooutput \
42
39
        -I$(top_srcdir)/lib/engine/components/dx-videooutput \
43
40
        -I$(top_srcdir)/lib/engine/components/echo \
44
41
        -I$(top_srcdir)/lib/engine/components/gmconf-personal-details \
45
42
        -I$(top_srcdir)/lib/engine/components/hal-dbus \
46
 
        -I$(top_srcdir)/lib/engine/components/libnotify \
47
43
        -I$(top_srcdir)/lib/engine/components/local-roster \
48
44
        -I$(top_srcdir)/lib/engine/components/mlogo-videoinput \
49
45
        -I$(top_srcdir)/lib/engine/components/null-audioinput \
50
46
        -I$(top_srcdir)/lib/engine/components/null-audiooutput \
51
47
        -I$(top_srcdir)/lib/engine/components/opal \
52
 
        -I$(top_srcdir)/lib/engine/components/ptlib \
53
 
        -I$(top_srcdir)/lib/engine/components/x-videooutput
 
48
        -I$(top_srcdir)/lib/engine/components/ptlib
54
49
 
55
50
AM_CFLAGS = \
56
 
        $(GLIB_CFLAGS) $(GTK_CFLAGS) $(GCONF_CFLAGS) $(DBUS_CFLAGS)
 
51
        $(GLIB_CFLAGS) $(GTK_CFLAGS) $(GCONF_CFLAGS) $(DBUS_CFLAGS) $(NOTIFY_CFLAGS)
57
52
 
58
53
AM_CPPFLAGS = \
59
54
        $(BOOST_CPPFLAGS) $(GLIB_CFLAGS) $(XML_CFLAGS) $(GTK_CFLAGS) \
60
 
        $(DBUS_CFLAGS) $(PTLIB_CFLAGS) $(OPAL_CFLAGS)
 
55
        $(DBUS_CFLAGS) $(PTLIB_CFLAGS) $(OPAL_CFLAGS) $(NOTIFY_LIBS)
61
56
AM_LIBS = \
62
57
        $(BOOST_LIBS) $(GLIB_LIBS) $(XML_LIBS) $(GTK_LIBS)
63
58
 
83
78
gmmarshallers.c: gmmarshallers.list
84
79
        $(LIBTOOL) --mode=execute glib-genmarshal --prefix=gm_marshal $^ --body > $@.tmp && mv $@.tmp $@
85
80
 
86
 
##
87
 
# Sources out of the toolbox directory
88
 
##
89
81
libekiga_la_SOURCES += \
90
 
        $(top_srcdir)/lib/toolbox/toolbox.h \
91
 
        $(top_srcdir)/lib/toolbox/toolbox-common.c \
92
 
        $(top_srcdir)/lib/toolbox/toolbox-internal.h \
93
 
        $(top_srcdir)/lib/toolbox/toolbox-internal.c
94
 
 
95
 
if WIN32
96
 
libekiga_la_SOURCES += $(top_srcdir)/lib/toolbox/toolbox-win32.c
97
 
else
98
 
libekiga_la_SOURCES += $(top_srcdir)/lib/toolbox/toolbox-gtk.c
99
 
endif
 
82
        $(top_srcdir)/lib/toolbox.h \
 
83
        $(top_srcdir)/lib/toolbox.c
100
84
 
101
85
##
102
86
# Sources out of the platform directory
103
87
##
104
88
 
105
 
libekiga_la_SOURCES += $(top_srcdir)/lib/platform/gm-platform.h
 
89
libekiga_la_SOURCES += \
 
90
        $(top_srcdir)/lib/platform/platform.h \
 
91
        $(top_srcdir)/lib/platform/platform.c
106
92
 
107
93
if WIN32
108
 
libekiga_la_SOURCES += \
109
 
        $(top_srcdir)/lib/platform/platform-win32.c \
110
 
        $(top_srcdir)/lib/platform/winpaths.h
111
 
else
112
 
libekiga_la_SOURCES += $(top_srcdir)/lib/platform/platform-generic.c
 
94
libekiga_la_SOURCES += $(top_srcdir)/lib/platform/winpaths.h
113
95
endif
114
96
 
115
97
##
158
140
        $(top_srcdir)/lib/gui/gm-smileys.c \
159
141
        $(top_srcdir)/lib/gui/gmwindow.c \
160
142
        $(top_srcdir)/lib/gui/gmwindow.h \
 
143
        $(top_srcdir)/lib/gui/gmcallbacks.c \
 
144
        $(top_srcdir)/lib/gui/gmcallbacks.h \
161
145
        $(top_srcdir)/lib/gui/gmconfwidgets.c \
162
146
        $(top_srcdir)/lib/gui/gmconfwidgets.h \
163
147
        $(top_srcdir)/lib/gui/gmdialog.c \
443
427
libekiga_la_SOURCES += \
444
428
        $(engine_dir)/gui/gtk-frontend/addressbook-window.h \
445
429
        $(engine_dir)/gui/gtk-frontend/addressbook-window.cpp \
 
430
        $(engine_dir)/gui/gtk-frontend/accounts-window.h \
 
431
        $(engine_dir)/gui/gtk-frontend/accounts-window.cpp \
446
432
        $(engine_dir)/gui/gtk-frontend/book-view-gtk.h \
447
433
        $(engine_dir)/gui/gtk-frontend/book-view-gtk.cpp \
 
434
        $(engine_dir)/gui/gtk-frontend/call-window.h \
 
435
        $(engine_dir)/gui/gtk-frontend/call-window.cpp \
448
436
        $(engine_dir)/gui/gtk-frontend/roster-view-gtk.h \
449
437
        $(engine_dir)/gui/gtk-frontend/roster-view-gtk.cpp \
450
438
        $(engine_dir)/gui/gtk-frontend/call-history-view-gtk.h \
451
439
        $(engine_dir)/gui/gtk-frontend/call-history-view-gtk.cpp \
 
440
        $(engine_dir)/gui/gtk-frontend/default_devices.cpp \
 
441
        $(engine_dir)/gui/gtk-frontend/default_devices.h \
452
442
        $(engine_dir)/gui/gtk-frontend/presentity-view.h \
453
443
        $(engine_dir)/gui/gtk-frontend/presentity-view.cpp \
454
444
        $(engine_dir)/gui/gtk-frontend/heap-view.h \
459
449
        $(engine_dir)/gui/gtk-frontend/simple-chat-page.cpp \
460
450
        $(engine_dir)/gui/gtk-frontend/multiple-chat-page.h \
461
451
        $(engine_dir)/gui/gtk-frontend/multiple-chat-page.cpp \
 
452
        $(engine_dir)/gui/gtk-frontend/preferences-window.cpp \
 
453
        $(engine_dir)/gui/gtk-frontend/preferences-window.h \
 
454
        $(engine_dir)/gui/gtk-frontend/statusicon.cpp \
 
455
        $(engine_dir)/gui/gtk-frontend/statusicon.h \
462
456
        $(engine_dir)/gui/gtk-frontend/chat-window.h \
463
457
        $(engine_dir)/gui/gtk-frontend/chat-window.cpp \
464
458
        $(engine_dir)/gui/gtk-frontend/gtk-frontend.h \
662
656
endif
663
657
 
664
658
##
665
 
# Common support for avahi
666
 
##
667
 
if HAVE_AVAHI
668
 
 
669
 
libekiga_la_LDFLAGS += $(AVAHI_LIBS)
670
 
 
671
 
endif
672
 
 
673
 
##
674
 
# Sources of the avahi publisher component
675
 
##
676
 
if HAVE_AVAHI
 
659
# Support for avahi
 
660
##
 
661
if HAVE_AVAHI
 
662
 
 
663
INCLUDES += \
 
664
        -I$(top_srcdir)/lib/engine/components/avahi \
 
665
        -I$(top_srcdir)/lib/engine/components/avahi-publisher
677
666
 
678
667
libekiga_la_SOURCES += \
679
668
        $(components_dir)/avahi-publisher/avahi-publisher-main.cpp \
681
670
        $(components_dir)/avahi-publisher/avahi-publisher.cpp \
682
671
        $(components_dir)/avahi-publisher/avahi-publisher.h
683
672
 
684
 
endif
685
 
 
686
 
##
687
 
# Sources of the avahi browser component
688
 
##
689
 
if HAVE_AVAHI
690
 
 
691
673
libekiga_la_SOURCES += \
692
674
        $(components_dir)/avahi/avahi-heap.h \
693
675
        $(components_dir)/avahi/avahi-heap.cpp \
696
678
        $(components_dir)/avahi/avahi-main.h \
697
679
        $(components_dir)/avahi/avahi-main.cpp
698
680
 
 
681
libekiga_la_LDFLAGS += $(AVAHI_LIBS)
 
682
 
699
683
endif
700
684
 
701
685
##
703
687
##
704
688
if HAVE_NOTIFY
705
689
 
 
690
INCLUDES += \
 
691
        -I$(top_srcdir)/lib/engine/components/libnotify
 
692
 
706
693
libekiga_la_SOURCES += \
707
694
        $(components_dir)/libnotify/libnotify-main.h \
708
695
        $(components_dir)/libnotify/libnotify-main.cpp
725
712
 
726
713
if !WIN32
727
714
 
 
715
INCLUDES += \
 
716
        -I$(top_srcdir)/lib/engine/components/x-videooutput
 
717
 
728
718
libekiga_la_SOURCES += \
729
719
        $(components_dir)/x-videooutput/videooutput-manager-x.cpp \
730
720
        $(components_dir)/x-videooutput/videooutput-manager-x.h \