[ekiga] Fix previous commit on using subdir-objects with automake 1.14
- From: Eugen Dedu <ededu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] Fix previous commit on using subdir-objects with automake 1.14
- Date: Thu, 19 Sep 2013 15:59:49 +0000 (UTC)
commit d501901d7252d755099fdcb5246efcfa43d70e72
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date: Thu Sep 19 17:59:23 2013 +0200
Fix previous commit on using subdir-objects with automake 1.14
lib/Makefile.am | 689 ++++++++++++++++++-------------------
plugins/avahi/Makefile.am | 16 +-
plugins/evolution/Makefile.am | 18 +-
plugins/gstreamer/Makefile.am | 22 +-
plugins/kab/Makefile.am | 18 +-
plugins/kde/Makefile.am | 6 +-
plugins/ldap/Makefile.am | 18 +-
plugins/libnotify/Makefile.am | 4 +-
plugins/loudmouth/Makefile.am | 42 +--
plugins/resource-list/Makefile.am | 30 +-
plugins/xcap/Makefile.am | 14 +-
src/Makefile.am | 4 +-
12 files changed, 429 insertions(+), 452 deletions(-)
---
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 1854452..a5f3a72 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -54,9 +54,6 @@ AM_CFLAGS = \
AM_LIBS = $(GLIB_LIBS) $(XML_LIBS) $(GTK_LIBS)
-engine_dir = $(top_srcdir)/lib/engine
-components_dir = $(top_srcdir)/lib/engine/components
-
##
# Sources out of this directory
##
@@ -74,11 +71,11 @@ BUILT_SOURCES =
##
libekiga_la_SOURCES += \
- $(top_srcdir)/lib/platform/platform.h \
- $(top_srcdir)/lib/platform/platform.c
+ platform/platform.h \
+ platform/platform.c
if WIN32
-libekiga_la_SOURCES += $(top_srcdir)/lib/platform/winpaths.h
+libekiga_la_SOURCES += platform/winpaths.h
endif
##
@@ -90,16 +87,16 @@ AM_CPPFLAGS += -I$(top_srcdir)/lib/pixops
EXTRA_DIST += $(top_srcdir)/lib/pixops/README
libekiga_la_SOURCES += \
- $(top_srcdir)/lib/pixops/pixops.h \
- $(top_srcdir)/lib/pixops/pixops.c \
- $(top_srcdir)/lib/pixops/pixops-internal.h
+ pixops/pixops.h \
+ pixops/pixops.c \
+ pixops/pixops-internal.h
if USE_MMX
libekiga_la_SOURCES += \
- $(top_srcdir)/lib/pixops/have_mmx.S \
- $(top_srcdir)/lib/pixops/scale_line_22_33_mmx.S \
- $(top_srcdir)/lib/pixops/composite_line_22_4a4_mmx.S \
- $(top_srcdir)/lib/pixops/composite_line_color_22_4a4_mmx.S
+ pixops/have_mmx.S \
+ pixops/scale_line_22_33_mmx.S \
+ pixops/composite_line_22_4a4_mmx.S \
+ pixops/composite_line_color_22_4a4_mmx.S
endif
endif
@@ -108,74 +105,74 @@ endif
# Sources out of the gmconf directory
##
libekiga_la_SOURCES += \
- $(top_srcdir)/lib/gmconf/gmconf.h \
- $(top_srcdir)/lib/gmconf/gmconf-ekiga-keys.h \
- $(top_srcdir)/lib/gmconf/gmconf-upgrade.h \
- $(top_srcdir)/lib/gmconf/gmconf-upgrade.c
+ gmconf/gmconf.h \
+ gmconf/gmconf-ekiga-keys.h \
+ gmconf/gmconf-upgrade.h \
+ gmconf/gmconf-upgrade.c
if HAVE_GCONF
-libekiga_la_SOURCES += $(top_srcdir)/lib/gmconf/gmconf-gconf.c
+libekiga_la_SOURCES += gmconf/gmconf-gconf.c
libekiga_la_LDFLAGS += $(GCONF_LIBS)
else
-libekiga_la_SOURCES += $(top_srcdir)/lib/gmconf/gmconf-glib.c
+libekiga_la_SOURCES += gmconf/gmconf-glib.c
endif
##
# Sources out of the gui directory
-# (those should probably be moved elsewhere like lib/engine/gui/gtk-core/ )
-##
-libekiga_la_SOURCES += \
- $(top_srcdir)/lib/gui/dialpad.h \
- $(top_srcdir)/lib/gui/dialpad.c \
- $(top_srcdir)/lib/gui/gm-smileys.h \
- $(top_srcdir)/lib/gui/gm-smileys.c \
- $(top_srcdir)/lib/gui/gmwindow.c \
- $(top_srcdir)/lib/gui/gmwindow.h \
- $(top_srcdir)/lib/gui/gmcallbacks.c \
- $(top_srcdir)/lib/gui/gmcallbacks.h \
- $(top_srcdir)/lib/gui/gmconfwidgets.c \
- $(top_srcdir)/lib/gui/gmconfwidgets.h \
- $(top_srcdir)/lib/gui/gmdialog.c \
- $(top_srcdir)/lib/gui/gmdialog.h \
- $(top_srcdir)/lib/gui/gmentrydialog.c \
- $(top_srcdir)/lib/gui/gmentrydialog.h \
- $(top_srcdir)/lib/gui/gmmenuaddon.c \
- $(top_srcdir)/lib/gui/gmmenuaddon.h \
- $(top_srcdir)/lib/gui/gmpreferences.c \
- $(top_srcdir)/lib/gui/gmpreferences.h \
- $(top_srcdir)/lib/gui/gmstatusbar.c \
- $(top_srcdir)/lib/gui/gmstatusbar.h \
- $(top_srcdir)/lib/gui/gmstockicons.c \
- $(top_srcdir)/lib/gui/gmstockicons.h \
- $(top_srcdir)/lib/gui/gmpowermeter.c \
- $(top_srcdir)/lib/gui/gmpowermeter.h \
- $(top_srcdir)/lib/gui/gmcellrendererexpander.c \
- $(top_srcdir)/lib/gui/gmcellrendererexpander.h \
- $(top_srcdir)/lib/gui/gm-cell-renderer-bitext.c \
- $(top_srcdir)/lib/gui/gm-cell-renderer-bitext.h \
- $(top_srcdir)/lib/gui/gm-text-buffer-enhancer-helper-interface.c \
- $(top_srcdir)/lib/gui/gm-text-buffer-enhancer-helper-interface.h \
- $(top_srcdir)/lib/gui/gm-text-anchored-tag.c \
- $(top_srcdir)/lib/gui/gm-text-anchored-tag.h \
- $(top_srcdir)/lib/gui/gm-text-smiley.c \
- $(top_srcdir)/lib/gui/gm-text-smiley.h \
- $(top_srcdir)/lib/gui/gm-text-extlink.c \
- $(top_srcdir)/lib/gui/gm-text-extlink.h \
- $(top_srcdir)/lib/gui/gm-text-buffer-enhancer.c \
- $(top_srcdir)/lib/gui/gm-text-buffer-enhancer.h \
- $(top_srcdir)/lib/gui/gm-smiley-chooser-button.c \
- $(top_srcdir)/lib/gui/gm-smiley-chooser-button.h
+# (those should probably be moved elsewhere like engine/gui/gtk-core/ )
+##
+libekiga_la_SOURCES += \
+ gui/dialpad.h \
+ gui/dialpad.c \
+ gui/gm-smileys.h \
+ gui/gm-smileys.c \
+ gui/gmwindow.c \
+ gui/gmwindow.h \
+ gui/gmcallbacks.c \
+ gui/gmcallbacks.h \
+ gui/gmconfwidgets.c \
+ gui/gmconfwidgets.h \
+ gui/gmdialog.c \
+ gui/gmdialog.h \
+ gui/gmentrydialog.c \
+ gui/gmentrydialog.h \
+ gui/gmmenuaddon.c \
+ gui/gmmenuaddon.h \
+ gui/gmpreferences.c \
+ gui/gmpreferences.h \
+ gui/gmstatusbar.c \
+ gui/gmstatusbar.h \
+ gui/gmstockicons.c \
+ gui/gmstockicons.h \
+ gui/gmpowermeter.c \
+ gui/gmpowermeter.h \
+ gui/gmcellrendererexpander.c \
+ gui/gmcellrendererexpander.h \
+ gui/gm-cell-renderer-bitext.c \
+ gui/gm-cell-renderer-bitext.h \
+ gui/gm-text-buffer-enhancer-helper-interface.c \
+ gui/gm-text-buffer-enhancer-helper-interface.h \
+ gui/gm-text-anchored-tag.c \
+ gui/gm-text-anchored-tag.h \
+ gui/gm-text-smiley.c \
+ gui/gm-text-smiley.h \
+ gui/gm-text-extlink.c \
+ gui/gm-text-extlink.h \
+ gui/gm-text-buffer-enhancer.c \
+ gui/gm-text-buffer-enhancer.h \
+ gui/gm-smiley-chooser-button.c \
+ gui/gm-smiley-chooser-button.h
if !WIN32
libekiga_la_SOURCES += \
- $(top_srcdir)/lib/gui/xwindow.cpp \
- $(top_srcdir)/lib/gui/xwindow.h
+ gui/xwindow.cpp \
+ gui/xwindow.h
endif
if HAVE_XV
libekiga_la_SOURCES += \
- $(top_srcdir)/lib/gui/xvwindow.cpp \
- $(top_srcdir)/lib/gui/xvwindow.h
+ gui/xvwindow.cpp \
+ gui/xvwindow.h
libekiga_la_LDFLAGS += $(XV_LIBS)
@@ -183,8 +180,8 @@ endif
if HAVE_DX
libekiga_la_SOURCES += \
- $(top_srcdir)/lib/gui/dxwindow.cpp \
- $(top_srcdir)/lib/gui/dxwindow.h
+ gui/dxwindow.cpp \
+ gui/dxwindow.h
endif
##
@@ -192,291 +189,291 @@ endif
##
libekiga_la_SOURCES += \
- $(engine_dir)/engine.h \
- $(engine_dir)/engine.cpp
+ engine/engine.h \
+ engine/engine.cpp
##
# Sources of the engine framework code
##
libekiga_la_SOURCES += \
- $(engine_dir)/framework/boost-exceptions.cpp \
- $(engine_dir)/framework/services.h \
- $(engine_dir)/framework/map-key-iterator.h \
- $(engine_dir)/framework/map-key-const-iterator.h \
- $(engine_dir)/framework/reflister.h \
- $(engine_dir)/framework/chain-of-responsibility.h \
- $(engine_dir)/framework/device-def.h \
- $(engine_dir)/framework/form-builder.h \
- $(engine_dir)/framework/form-dumper.h \
- $(engine_dir)/framework/form.h \
- $(engine_dir)/framework/form.cpp \
- $(engine_dir)/framework/form-request.h \
- $(engine_dir)/framework/form-request-simple.h \
- $(engine_dir)/framework/robust-xml.h \
- $(engine_dir)/framework/robust-xml.cpp \
- $(engine_dir)/framework/form-visitor.h \
- $(engine_dir)/framework/gmconf-bridge.h \
- $(engine_dir)/framework/gmconf-bridge.cpp \
- $(engine_dir)/framework/runtime.h \
- $(engine_dir)/framework/menu-builder.h \
- $(engine_dir)/framework/menu-builder.cpp \
- $(engine_dir)/framework/menu-builder-tools.h \
- $(engine_dir)/framework/menu-builder-tools.cpp \
- $(engine_dir)/framework/form-builder.cpp \
- $(engine_dir)/framework/form-dumper.cpp \
- $(engine_dir)/framework/form-request-simple.cpp \
- $(engine_dir)/framework/runtime-glib.cpp \
- $(engine_dir)/framework/services.cpp \
- $(engine_dir)/framework/trigger.h \
- $(engine_dir)/framework/menu-xml.h \
- $(engine_dir)/framework/menu-xml.cpp \
- $(engine_dir)/framework/kickstart.h \
- $(engine_dir)/framework/kickstart.cpp \
- $(engine_dir)/framework/personal-details.h \
- $(engine_dir)/framework/ptr_array.h \
- $(engine_dir)/framework/ptr_array_iterator.h \
- $(engine_dir)/framework/ptr_array_const_iterator.h \
- $(engine_dir)/framework/live-object.h \
- $(engine_dir)/framework/filterable.h \
- $(engine_dir)/framework/scoped-connections.h
+ engine/framework/boost-exceptions.cpp \
+ engine/framework/services.h \
+ engine/framework/map-key-iterator.h \
+ engine/framework/map-key-const-iterator.h \
+ engine/framework/reflister.h \
+ engine/framework/chain-of-responsibility.h \
+ engine/framework/device-def.h \
+ engine/framework/form-builder.h \
+ engine/framework/form-dumper.h \
+ engine/framework/form.h \
+ engine/framework/form.cpp \
+ engine/framework/form-request.h \
+ engine/framework/form-request-simple.h \
+ engine/framework/robust-xml.h \
+ engine/framework/robust-xml.cpp \
+ engine/framework/form-visitor.h \
+ engine/framework/gmconf-bridge.h \
+ engine/framework/gmconf-bridge.cpp \
+ engine/framework/runtime.h \
+ engine/framework/menu-builder.h \
+ engine/framework/menu-builder.cpp \
+ engine/framework/menu-builder-tools.h \
+ engine/framework/menu-builder-tools.cpp \
+ engine/framework/form-builder.cpp \
+ engine/framework/form-dumper.cpp \
+ engine/framework/form-request-simple.cpp \
+ engine/framework/runtime-glib.cpp \
+ engine/framework/services.cpp \
+ engine/framework/trigger.h \
+ engine/framework/menu-xml.h \
+ engine/framework/menu-xml.cpp \
+ engine/framework/kickstart.h \
+ engine/framework/kickstart.cpp \
+ engine/framework/personal-details.h \
+ engine/framework/ptr_array.h \
+ engine/framework/ptr_array_iterator.h \
+ engine/framework/ptr_array_const_iterator.h \
+ engine/framework/live-object.h \
+ engine/framework/filterable.h \
+ engine/framework/scoped-connections.h
##
# Sources of the plugin loader code
##
libekiga_la_SOURCES += \
- $(engine_dir)/plugin/plugin-core.h \
- $(engine_dir)/plugin/plugin-core.cpp
+ engine/plugin/plugin-core.h \
+ engine/plugin/plugin-core.cpp
##
# Sources of the account stack
##
libekiga_la_SOURCES += \
- $(engine_dir)/account/account.h \
- $(engine_dir)/account/bank.h \
- $(engine_dir)/account/bank-impl.h \
- $(engine_dir)/account/account-core.h \
- $(engine_dir)/account/account-core.cpp
+ engine/account/account.h \
+ engine/account/bank.h \
+ engine/account/bank-impl.h \
+ engine/account/account-core.h \
+ engine/account/account-core.cpp
##
# Sources of the addressbook stack
##
libekiga_la_SOURCES += \
- $(engine_dir)/addressbook/contact.h \
- $(engine_dir)/addressbook/book.h \
- $(engine_dir)/addressbook/book-impl.h \
- $(engine_dir)/addressbook/source.h \
- $(engine_dir)/addressbook/source-impl.h \
- $(engine_dir)/addressbook/contact-core.h \
- $(engine_dir)/addressbook/contact-core.cpp
+ engine/addressbook/contact.h \
+ engine/addressbook/book.h \
+ engine/addressbook/book-impl.h \
+ engine/addressbook/source.h \
+ engine/addressbook/source-impl.h \
+ engine/addressbook/contact-core.h \
+ engine/addressbook/contact-core.cpp
##
# Sources of the chat stack
##
libekiga_la_SOURCES += \
- $(engine_dir)/chat/chat-core.h \
- $(engine_dir)/chat/chat-core.cpp \
- $(engine_dir)/chat/dialect.h \
- $(engine_dir)/chat/dialect-impl.h \
- $(engine_dir)/chat/chat.h \
- $(engine_dir)/chat/chat-simple.h \
- $(engine_dir)/chat/chat-multiple.h
+ engine/chat/chat-core.h \
+ engine/chat/chat-core.cpp \
+ engine/chat/dialect.h \
+ engine/chat/dialect-impl.h \
+ engine/chat/chat.h \
+ engine/chat/chat-simple.h \
+ engine/chat/chat-multiple.h
##
# Sources of the friend-or-foe stack
##
libekiga_la_SOURCES += \
- $(engine_dir)/friend-or-foe/friend-or-foe.h \
- $(engine_dir)/friend-or-foe/friend-or-foe.cpp
+ engine/friend-or-foe/friend-or-foe.h \
+ engine/friend-or-foe/friend-or-foe.cpp
##
# Sources of the notification stack
##
libekiga_la_SOURCES += \
- $(engine_dir)/notification/notification-core.h \
- $(engine_dir)/notification/notification-dummy.cpp
+ engine/notification/notification-core.h \
+ engine/notification/notification-dummy.cpp
##
# Sources of the presence stack
##
libekiga_la_SOURCES += \
- $(engine_dir)/presence/presentity.h \
- $(engine_dir)/presence/heap.h \
- $(engine_dir)/presence/heap-impl.h \
- $(engine_dir)/presence/cluster.h \
- $(engine_dir)/presence/cluster-impl.h \
- $(engine_dir)/presence/uri-presentity.h \
- $(engine_dir)/presence/proxy-presentity.cpp \
- $(engine_dir)/presence/proxy-presentity.h \
- $(engine_dir)/presence/uri-presentity.cpp \
- $(engine_dir)/presence/presence-core.h \
- $(engine_dir)/presence/presence-core.cpp
+ engine/presence/presentity.h \
+ engine/presence/heap.h \
+ engine/presence/heap-impl.h \
+ engine/presence/cluster.h \
+ engine/presence/cluster-impl.h \
+ engine/presence/uri-presentity.h \
+ engine/presence/proxy-presentity.cpp \
+ engine/presence/proxy-presentity.h \
+ engine/presence/uri-presentity.cpp \
+ engine/presence/presence-core.h \
+ engine/presence/presence-core.cpp
##
# Sources of the protocol stack
##
libekiga_la_SOURCES += \
- $(engine_dir)/protocol/call-core.h \
- $(engine_dir)/protocol/call-manager.h \
- $(engine_dir)/protocol/call-manager.cpp \
- $(engine_dir)/protocol/call.h \
- $(engine_dir)/protocol/call-core.cpp \
- $(engine_dir)/protocol/call-protocol-manager.h \
- $(engine_dir)/protocol/codec-description.h \
- $(engine_dir)/protocol/codec-description.cpp
+ engine/protocol/call-core.h \
+ engine/protocol/call-manager.h \
+ engine/protocol/call-manager.cpp \
+ engine/protocol/call.h \
+ engine/protocol/call-core.cpp \
+ engine/protocol/call-protocol-manager.h \
+ engine/protocol/codec-description.h \
+ engine/protocol/codec-description.cpp
##
# Sources of the video output stack
##
libekiga_la_SOURCES += \
- $(engine_dir)/videooutput/videooutput-info.h \
- $(engine_dir)/videooutput/videooutput-manager.h \
- $(engine_dir)/videooutput/videooutput-core.h \
- $(engine_dir)/videooutput/videooutput-core.cpp \
- $(engine_dir)/videooutput/videooutput-gmconf-bridge.h \
- $(engine_dir)/videooutput/videooutput-gmconf-bridge.cpp
+ engine/videooutput/videooutput-info.h \
+ engine/videooutput/videooutput-manager.h \
+ engine/videooutput/videooutput-core.h \
+ engine/videooutput/videooutput-core.cpp \
+ engine/videooutput/videooutput-gmconf-bridge.h \
+ engine/videooutput/videooutput-gmconf-bridge.cpp
##
# Sources of the video input stack
##
libekiga_la_SOURCES += \
- $(engine_dir)/videoinput/videoinput-manager.h \
- $(engine_dir)/videoinput/videoinput-info.h \
- $(engine_dir)/videoinput/videoinput-core.h \
- $(engine_dir)/videoinput/videoinput-core.cpp \
- $(engine_dir)/videoinput/videoinput-gmconf-bridge.h \
- $(engine_dir)/videoinput/videoinput-gmconf-bridge.cpp
+ engine/videoinput/videoinput-manager.h \
+ engine/videoinput/videoinput-info.h \
+ engine/videoinput/videoinput-core.h \
+ engine/videoinput/videoinput-core.cpp \
+ engine/videoinput/videoinput-gmconf-bridge.h \
+ engine/videoinput/videoinput-gmconf-bridge.cpp
##
# Sources of the audio output stack
##
libekiga_la_SOURCES += \
- $(engine_dir)/audiooutput/audiooutput-manager.h \
- $(engine_dir)/audiooutput/audiooutput-info.h \
- $(engine_dir)/audiooutput/audiooutput-scheduler.h \
- $(engine_dir)/audiooutput/audiooutput-scheduler.cpp \
- $(engine_dir)/audiooutput/audiooutput-core.h \
- $(engine_dir)/audiooutput/audiooutput-core.cpp \
- $(engine_dir)/audiooutput/audiooutput-gmconf-bridge.h \
- $(engine_dir)/audiooutput/audiooutput-gmconf-bridge.cpp
+ engine/audiooutput/audiooutput-manager.h \
+ engine/audiooutput/audiooutput-info.h \
+ engine/audiooutput/audiooutput-scheduler.h \
+ engine/audiooutput/audiooutput-scheduler.cpp \
+ engine/audiooutput/audiooutput-core.h \
+ engine/audiooutput/audiooutput-core.cpp \
+ engine/audiooutput/audiooutput-gmconf-bridge.h \
+ engine/audiooutput/audiooutput-gmconf-bridge.cpp
##
# Sources of the audio input stack
##
libekiga_la_SOURCES += \
- $(engine_dir)/audioinput/audioinput-manager.h \
- $(engine_dir)/audioinput/audioinput-info.h \
- $(engine_dir)/audioinput/audioinput-core.h \
- $(engine_dir)/audioinput/audioinput-core.cpp \
- $(engine_dir)/audioinput/audioinput-gmconf-bridge.h \
- $(engine_dir)/audioinput/audioinput-gmconf-bridge.cpp
+ engine/audioinput/audioinput-manager.h \
+ engine/audioinput/audioinput-info.h \
+ engine/audioinput/audioinput-core.h \
+ engine/audioinput/audioinput-core.cpp \
+ engine/audioinput/audioinput-gmconf-bridge.h \
+ engine/audioinput/audioinput-gmconf-bridge.cpp
##
# Sources of the hardware abstraction layer (HAL) stack
##
libekiga_la_SOURCES += \
- $(engine_dir)/hal/hal-manager.h \
- $(engine_dir)/hal/hal-core.h \
- $(engine_dir)/hal/hal-core.cpp
+ engine/hal/hal-manager.h \
+ engine/hal/hal-core.h \
+ engine/hal/hal-core.cpp
##
# Sources of the gtk+ core
##
libekiga_la_SOURCES += \
- $(engine_dir)/gui/gtk-core/menu-builder-gtk.h \
- $(engine_dir)/gui/gtk-core/menu-builder-gtk.cpp \
- $(engine_dir)/gui/gtk-core/form-dialog-gtk.h \
- $(engine_dir)/gui/gtk-core/form-dialog-gtk.cpp \
- $(engine_dir)/gui/gtk-core/optional-buttons-gtk.h \
- $(engine_dir)/gui/gtk-core/optional-buttons-gtk.cpp \
- $(engine_dir)/gui/gtk-core/codecsbox.cpp \
- $(engine_dir)/gui/gtk-core/codecsbox.h \
- $(engine_dir)/gui/gtk-core/gtk-core.h \
- $(engine_dir)/gui/gtk-core/gtk-core.cpp \
- $(engine_dir)/gui/gtk-core/gtk-core-main.h \
- $(engine_dir)/gui/gtk-core/gtk-core-main.cpp
+ engine/gui/gtk-core/menu-builder-gtk.h \
+ engine/gui/gtk-core/menu-builder-gtk.cpp \
+ engine/gui/gtk-core/form-dialog-gtk.h \
+ engine/gui/gtk-core/form-dialog-gtk.cpp \
+ engine/gui/gtk-core/optional-buttons-gtk.h \
+ engine/gui/gtk-core/optional-buttons-gtk.cpp \
+ engine/gui/gtk-core/codecsbox.cpp \
+ engine/gui/gtk-core/codecsbox.h \
+ engine/gui/gtk-core/gtk-core.h \
+ engine/gui/gtk-core/gtk-core.cpp \
+ engine/gui/gtk-core/gtk-core-main.h \
+ engine/gui/gtk-core/gtk-core-main.cpp
##
# Sources of the gtk+ frontend
##
libekiga_la_SOURCES += \
- $(engine_dir)/gui/gtk-frontend/device-lists.h \
- $(engine_dir)/gui/gtk-frontend/device-lists.cpp \
- $(engine_dir)/gui/gtk-frontend/addressbook-window.h \
- $(engine_dir)/gui/gtk-frontend/addressbook-window.cpp \
- $(engine_dir)/gui/gtk-frontend/accounts-window.h \
- $(engine_dir)/gui/gtk-frontend/accounts-window.cpp \
- $(engine_dir)/gui/gtk-frontend/assistant-window.h \
- $(engine_dir)/gui/gtk-frontend/assistant-window.cpp \
- $(engine_dir)/gui/gtk-frontend/main_window.h \
- $(engine_dir)/gui/gtk-frontend/main_window.cpp \
- $(engine_dir)/gui/gtk-frontend/book-view-gtk.h \
- $(engine_dir)/gui/gtk-frontend/book-view-gtk.cpp \
- $(engine_dir)/gui/gtk-frontend/call-window.h \
- $(engine_dir)/gui/gtk-frontend/call-window.cpp \
- $(engine_dir)/gui/gtk-frontend/ext-window.h \
- $(engine_dir)/gui/gtk-frontend/ext-window.cpp \
- $(engine_dir)/gui/gtk-frontend/roster-view-gtk.h \
- $(engine_dir)/gui/gtk-frontend/roster-view-gtk.cpp \
- $(engine_dir)/gui/gtk-frontend/call-history-view-gtk.h \
- $(engine_dir)/gui/gtk-frontend/call-history-view-gtk.cpp \
- $(engine_dir)/gui/gtk-frontend/default_devices.cpp \
- $(engine_dir)/gui/gtk-frontend/default_devices.h \
- $(engine_dir)/gui/gtk-frontend/presentity-view.h \
- $(engine_dir)/gui/gtk-frontend/presentity-view.cpp \
- $(engine_dir)/gui/gtk-frontend/heap-view.h \
- $(engine_dir)/gui/gtk-frontend/heap-view.cpp \
- $(engine_dir)/gui/gtk-frontend/chat-area.h \
- $(engine_dir)/gui/gtk-frontend/chat-area.cpp \
- $(engine_dir)/gui/gtk-frontend/simple-chat-page.h \
- $(engine_dir)/gui/gtk-frontend/simple-chat-page.cpp \
- $(engine_dir)/gui/gtk-frontend/multiple-chat-page.h \
- $(engine_dir)/gui/gtk-frontend/multiple-chat-page.cpp \
- $(engine_dir)/gui/gtk-frontend/preferences-window.cpp \
- $(engine_dir)/gui/gtk-frontend/preferences-window.h \
- $(engine_dir)/gui/gtk-frontend/statusicon.cpp \
- $(engine_dir)/gui/gtk-frontend/statusicon.h \
- $(engine_dir)/gui/gtk-frontend/statusmenu.h \
- $(engine_dir)/gui/gtk-frontend/statusmenu.cpp \
- $(engine_dir)/gui/gtk-frontend/chat-window.h \
- $(engine_dir)/gui/gtk-frontend/chat-window.cpp \
- $(engine_dir)/gui/gtk-frontend/gtk-frontend.h \
- $(engine_dir)/gui/gtk-frontend/gtk-frontend.cpp
+ engine/gui/gtk-frontend/device-lists.h \
+ engine/gui/gtk-frontend/device-lists.cpp \
+ engine/gui/gtk-frontend/addressbook-window.h \
+ engine/gui/gtk-frontend/addressbook-window.cpp \
+ engine/gui/gtk-frontend/accounts-window.h \
+ engine/gui/gtk-frontend/accounts-window.cpp \
+ engine/gui/gtk-frontend/assistant-window.h \
+ engine/gui/gtk-frontend/assistant-window.cpp \
+ engine/gui/gtk-frontend/main_window.h \
+ engine/gui/gtk-frontend/main_window.cpp \
+ engine/gui/gtk-frontend/book-view-gtk.h \
+ engine/gui/gtk-frontend/book-view-gtk.cpp \
+ engine/gui/gtk-frontend/call-window.h \
+ engine/gui/gtk-frontend/call-window.cpp \
+ engine/gui/gtk-frontend/ext-window.h \
+ engine/gui/gtk-frontend/ext-window.cpp \
+ engine/gui/gtk-frontend/roster-view-gtk.h \
+ engine/gui/gtk-frontend/roster-view-gtk.cpp \
+ engine/gui/gtk-frontend/call-history-view-gtk.h \
+ engine/gui/gtk-frontend/call-history-view-gtk.cpp \
+ engine/gui/gtk-frontend/default_devices.cpp \
+ engine/gui/gtk-frontend/default_devices.h \
+ engine/gui/gtk-frontend/presentity-view.h \
+ engine/gui/gtk-frontend/presentity-view.cpp \
+ engine/gui/gtk-frontend/heap-view.h \
+ engine/gui/gtk-frontend/heap-view.cpp \
+ engine/gui/gtk-frontend/chat-area.h \
+ engine/gui/gtk-frontend/chat-area.cpp \
+ engine/gui/gtk-frontend/simple-chat-page.h \
+ engine/gui/gtk-frontend/simple-chat-page.cpp \
+ engine/gui/gtk-frontend/multiple-chat-page.h \
+ engine/gui/gtk-frontend/multiple-chat-page.cpp \
+ engine/gui/gtk-frontend/preferences-window.cpp \
+ engine/gui/gtk-frontend/preferences-window.h \
+ engine/gui/gtk-frontend/statusicon.cpp \
+ engine/gui/gtk-frontend/statusicon.h \
+ engine/gui/gtk-frontend/statusmenu.h \
+ engine/gui/gtk-frontend/statusmenu.cpp \
+ engine/gui/gtk-frontend/chat-window.h \
+ engine/gui/gtk-frontend/chat-window.cpp \
+ engine/gui/gtk-frontend/gtk-frontend.h \
+ engine/gui/gtk-frontend/gtk-frontend.cpp
##
# Sources of the ptlib component
##
libekiga_la_SOURCES += \
- $(components_dir)/ptlib/utils.h \
- $(components_dir)/ptlib/utils.cpp \
- $(components_dir)/ptlib/audioinput-manager-ptlib.h \
- $(components_dir)/ptlib/audioinput-manager-ptlib.cpp \
- $(components_dir)/ptlib/audioinput-main-ptlib.h \
- $(components_dir)/ptlib/audioinput-main-ptlib.cpp \
- $(components_dir)/ptlib/videoinput-manager-ptlib.h \
- $(components_dir)/ptlib/videoinput-manager-ptlib.cpp \
- $(components_dir)/ptlib/videoinput-main-ptlib.h \
- $(components_dir)/ptlib/videoinput-main-ptlib.cpp \
- $(components_dir)/ptlib/audiooutput-manager-ptlib.h \
- $(components_dir)/ptlib/audiooutput-manager-ptlib.cpp \
- $(components_dir)/ptlib/audiooutput-main-ptlib.h \
- $(components_dir)/ptlib/audiooutput-main-ptlib.cpp
+ engine/components/ptlib/utils.h \
+ engine/components/ptlib/utils.cpp \
+ engine/components/ptlib/audioinput-manager-ptlib.h \
+ engine/components/ptlib/audioinput-manager-ptlib.cpp \
+ engine/components/ptlib/audioinput-main-ptlib.h \
+ engine/components/ptlib/audioinput-main-ptlib.cpp \
+ engine/components/ptlib/videoinput-manager-ptlib.h \
+ engine/components/ptlib/videoinput-manager-ptlib.cpp \
+ engine/components/ptlib/videoinput-main-ptlib.h \
+ engine/components/ptlib/videoinput-main-ptlib.cpp \
+ engine/components/ptlib/audiooutput-manager-ptlib.h \
+ engine/components/ptlib/audiooutput-manager-ptlib.cpp \
+ engine/components/ptlib/audiooutput-main-ptlib.h \
+ engine/components/ptlib/audiooutput-main-ptlib.cpp
libekiga_la_LDFLAGS += $(PTLIB_LIBS)
@@ -485,44 +482,44 @@ libekiga_la_LDFLAGS += $(PTLIB_LIBS)
##
libekiga_la_SOURCES += \
- $(components_dir)/opal/opal-call-manager.h \
- $(components_dir)/opal/opal-call-manager.cpp \
- $(components_dir)/opal/pcss-endpoint.h \
- $(components_dir)/opal/pcss-endpoint.cpp \
- $(components_dir)/opal/opal-account.h \
- $(components_dir)/opal/opal-account.cpp \
- $(components_dir)/opal/opal-bank.h \
- $(components_dir)/opal/opal-bank.cpp \
- $(components_dir)/opal/opal-call.h \
- $(components_dir)/opal/opal-call.cpp \
- $(components_dir)/opal/opal-codec-description.h \
- $(components_dir)/opal/opal-codec-description.cpp \
- $(components_dir)/opal/opal-gmconf-bridge.h \
- $(components_dir)/opal/opal-gmconf-bridge.cpp \
- $(components_dir)/opal/opal-main.h \
- $(components_dir)/opal/opal-main.cpp \
- $(components_dir)/opal/opal-audio.h \
- $(components_dir)/opal/opal-audio.cpp \
- $(components_dir)/opal/opal-videoinput.h \
- $(components_dir)/opal/opal-videoinput.cpp \
- $(components_dir)/opal/opal-videooutput.h \
- $(components_dir)/opal/opal-videooutput.cpp \
- $(components_dir)/opal/opal-plugins-hook.h \
- $(components_dir)/opal/opal-plugins-hook.cpp
+ engine/components/opal/opal-call-manager.h \
+ engine/components/opal/opal-call-manager.cpp \
+ engine/components/opal/pcss-endpoint.h \
+ engine/components/opal/pcss-endpoint.cpp \
+ engine/components/opal/opal-account.h \
+ engine/components/opal/opal-account.cpp \
+ engine/components/opal/opal-bank.h \
+ engine/components/opal/opal-bank.cpp \
+ engine/components/opal/opal-call.h \
+ engine/components/opal/opal-call.cpp \
+ engine/components/opal/opal-codec-description.h \
+ engine/components/opal/opal-codec-description.cpp \
+ engine/components/opal/opal-gmconf-bridge.h \
+ engine/components/opal/opal-gmconf-bridge.cpp \
+ engine/components/opal/opal-main.h \
+ engine/components/opal/opal-main.cpp \
+ engine/components/opal/opal-audio.h \
+ engine/components/opal/opal-audio.cpp \
+ engine/components/opal/opal-videoinput.h \
+ engine/components/opal/opal-videoinput.cpp \
+ engine/components/opal/opal-videooutput.h \
+ engine/components/opal/opal-videooutput.cpp \
+ engine/components/opal/opal-plugins-hook.h \
+ engine/components/opal/opal-plugins-hook.cpp
if HAVE_H323
libekiga_la_SOURCES += \
- $(components_dir)/opal/h323-endpoint.h \
- $(components_dir)/opal/h323-endpoint.cpp
+ engine/components/opal/h323-endpoint.h \
+ engine/components/opal/h323-endpoint.cpp
endif
libekiga_la_SOURCES += \
- $(components_dir)/opal/sip-chat-simple.h \
- $(components_dir)/opal/sip-chat-simple.cpp \
- $(components_dir)/opal/sip-dialect.h \
- $(components_dir)/opal/sip-dialect.cpp \
- $(components_dir)/opal/sip-endpoint.h \
- $(components_dir)/opal/sip-endpoint.cpp
+ engine/components/opal/sip-chat-simple.h \
+ engine/components/opal/sip-chat-simple.cpp \
+ engine/components/opal/sip-dialect.h \
+ engine/components/opal/sip-dialect.cpp \
+ engine/components/opal/sip-endpoint.h \
+ engine/components/opal/sip-endpoint.cpp
libekiga_la_LDFLAGS += $(OPAL_LIBS)
@@ -531,82 +528,82 @@ libekiga_la_LDFLAGS += $(OPAL_LIBS)
##
libekiga_la_SOURCES += \
- $(components_dir)/call-history/history-contact.h \
- $(components_dir)/call-history/history-contact.cpp \
- $(components_dir)/call-history/history-book.h \
- $(components_dir)/call-history/history-book.cpp \
- $(components_dir)/call-history/history-source.h \
- $(components_dir)/call-history/history-source.cpp \
- $(components_dir)/call-history/history-main.h \
- $(components_dir)/call-history/history-main.cpp
+ engine/components/call-history/history-contact.h \
+ engine/components/call-history/history-contact.cpp \
+ engine/components/call-history/history-book.h \
+ engine/components/call-history/history-book.cpp \
+ engine/components/call-history/history-source.h \
+ engine/components/call-history/history-source.cpp \
+ engine/components/call-history/history-main.h \
+ engine/components/call-history/history-main.cpp
##
# Sources of the text chat echo component
##
libekiga_la_SOURCES += \
- $(components_dir)/echo/echo-presentity.h \
- $(components_dir)/echo/echo-presentity.cpp \
- $(components_dir)/echo/echo-simple.h \
- $(components_dir)/echo/echo-simple.cpp \
- $(components_dir)/echo/echo-dialect.h \
- $(components_dir)/echo/echo-dialect.cpp \
- $(components_dir)/echo/echo-main.h \
- $(components_dir)/echo/echo-main.cpp
+ engine/components/echo/echo-presentity.h \
+ engine/components/echo/echo-presentity.cpp \
+ engine/components/echo/echo-simple.h \
+ engine/components/echo/echo-simple.cpp \
+ engine/components/echo/echo-dialect.h \
+ engine/components/echo/echo-dialect.cpp \
+ engine/components/echo/echo-main.h \
+ engine/components/echo/echo-main.cpp
##
# Sources of the gmconf personal details component
##
libekiga_la_SOURCES += \
- $(components_dir)/gmconf-personal-details/gmconf-personal-details.cpp \
- $(components_dir)/gmconf-personal-details/gmconf-personal-details.h
+ engine/components/gmconf-personal-details/gmconf-personal-details.cpp \
+ engine/components/gmconf-personal-details/gmconf-personal-details.h
##
# Sources of the local roster component
##
libekiga_la_SOURCES += \
- $(components_dir)/local-roster/local-presentity.h \
- $(components_dir)/local-roster/local-presentity.cpp \
- $(components_dir)/local-roster/local-heap.h \
- $(components_dir)/local-roster/local-heap.cpp \
- $(components_dir)/local-roster/local-cluster.h \
- $(components_dir)/local-roster/local-cluster.cpp \
- $(components_dir)/local-roster/local-roster-main.h \
- $(components_dir)/local-roster/local-roster-main.cpp \
- $(components_dir)/local-roster/local-roster-bridge.h \
- $(components_dir)/local-roster/local-roster-bridge.cpp
+ engine/components/local-roster/local-presentity.h \
+ engine/components/local-roster/local-presentity.cpp \
+ engine/components/local-roster/local-heap.h \
+ engine/components/local-roster/local-heap.cpp \
+ engine/components/local-roster/local-cluster.h \
+ engine/components/local-roster/local-cluster.cpp \
+ engine/components/local-roster/local-roster-main.h \
+ engine/components/local-roster/local-roster-main.cpp \
+ engine/components/local-roster/local-roster-bridge.h \
+ engine/components/local-roster/local-roster-bridge.cpp
##
# Sources of the moving logo component
##
libekiga_la_SOURCES += \
- $(components_dir)/mlogo-videoinput/videoinput-manager-mlogo.h \
- $(components_dir)/mlogo-videoinput/videoinput-manager-mlogo.cpp \
- $(components_dir)/mlogo-videoinput/videoinput-main-mlogo.h \
- $(components_dir)/mlogo-videoinput/videoinput-main-mlogo.cpp
+ engine/components/mlogo-videoinput/videoinput-manager-mlogo.h \
+ engine/components/mlogo-videoinput/videoinput-manager-mlogo.cpp \
+ engine/components/mlogo-videoinput/videoinput-main-mlogo.h \
+ engine/components/mlogo-videoinput/videoinput-main-mlogo.cpp
##
# Sources of the null audio input component
##
libekiga_la_SOURCES += \
- $(components_dir)/null-audioinput/audioinput-manager-null.h \
- $(components_dir)/null-audioinput/audioinput-manager-null.cpp \
- $(components_dir)/null-audioinput/audioinput-main-null.h \
- $(components_dir)/null-audioinput/audioinput-main-null.cpp
+ engine/components/null-audioinput/audioinput-manager-null.h \
+ engine/components/null-audioinput/audioinput-manager-null.cpp \
+ engine/components/null-audioinput/audioinput-main-null.h \
+ engine/components/null-audioinput/audioinput-main-null.cpp
##
# Sources of the null audio output component
##
libekiga_la_SOURCES += \
- $(components_dir)/null-audiooutput/audiooutput-manager-null.h \
- $(components_dir)/null-audiooutput/audiooutput-manager-null.cpp \
- $(components_dir)/null-audiooutput/audiooutput-main-null.h \
- $(components_dir)/null-audiooutput/audiooutput-main-null.cpp
+ engine/components/null-audiooutput/audiooutput-manager-null.h \
+ engine/components/null-audiooutput/audiooutput-manager-null.cpp \
+ engine/components/null-audiooutput/audiooutput-main-null.h \
+ engine/components/null-audiooutput/audiooutput-main-null.cpp
##
# Sources of the hal dbus component
@@ -614,32 +611,32 @@ libekiga_la_SOURCES += \
if HAVE_DBUS
libekiga_la_SOURCES += \
- $(components_dir)/hal-dbus/hal-manager-dbus.h \
- $(components_dir)/hal-dbus/hal-manager-dbus.cpp \
- $(components_dir)/hal-dbus/hal-main-dbus.h \
- $(components_dir)/hal-dbus/hal-main-dbus.cpp
+ engine/components/hal-dbus/hal-manager-dbus.h \
+ engine/components/hal-dbus/hal-manager-dbus.cpp \
+ engine/components/hal-dbus/hal-main-dbus.h \
+ engine/components/hal-dbus/hal-main-dbus.cpp
if HAVE_V4L
libekiga_la_SOURCES += \
- $(components_dir)/hal-dbus/hal-v4l-helper.h \
- $(components_dir)/hal-dbus/hal-v4l-helper.c
+ engine/components/hal-dbus/hal-v4l-helper.h \
+ engine/components/hal-dbus/hal-v4l-helper.c
endif
nodist_libekiga_la_SOURCES += \
- $(builddir)/hal-marshal.h \
- $(builddir)/hal-marshal.c
+ engine/components/hal-dbus/hal-marshal.h \
+ engine/components/hal-dbus/hal-marshal.c
libekiga_la_LDFLAGS += $(DBUS_LIBS)
# forces the HAVE :
-BUILT_SOURCES += $(builddir)/hal-marshal.h $(builddir)/hal-marshal.c
-CLEANFILES += $(builddir)/hal-marshal.h $(builddir)/hal-marshal.c
-EXTRA_DIST += $(components_dir)/hal-dbus/hal-marshal.list
+BUILT_SOURCES += engine/components/hal-dbus/hal-marshal.h engine/components/hal-dbus/hal-marshal.c
+CLEANFILES += engine/components/hal-dbus/hal-marshal.h engine/components/hal-dbus/hal-marshal.c
+EXTRA_DIST += engine/components/hal-dbus/hal-marshal.list
-$(builddir)/hal-marshal.h: $(components_dir)/hal-dbus/hal-marshal.list
+engine/components/hal-dbus/hal-marshal.h: engine/components/hal-dbus/hal-marshal.list
$(AM_V_GEN)$(LIBTOOL) --mode=execute glib-genmarshal --prefix=gm_hal_dbus_marshal $^ --header > $
tmp && mv $ tmp $@
-$(builddir)/hal-marshal.c: $(components_dir)/hal-dbus/hal-marshal.list
+engine/components/hal-dbus/hal-marshal.c: engine/components/hal-dbus/hal-marshal.list
$(AM_V_GEN)$(LIBTOOL) --mode=execute glib-genmarshal --prefix=gm_hal_dbus_marshal $^ --body > $ tmp
&& mv $ tmp $@
endif
@@ -658,8 +655,8 @@ endif
##
libekiga_la_SOURCES += \
- $(components_dir)/common-videooutput/videooutput-manager-common.cpp \
- $(components_dir)/common-videooutput/videooutput-manager-common.h
+ engine/components/common-videooutput/videooutput-manager-common.cpp \
+ engine/components/common-videooutput/videooutput-manager-common.h
##
# Sources of the X video output component
@@ -671,10 +668,10 @@ AM_CPPFLAGS += \
-I$(top_srcdir)/lib/engine/components/x-videooutput
libekiga_la_SOURCES += \
- $(components_dir)/x-videooutput/videooutput-manager-x.cpp \
- $(components_dir)/x-videooutput/videooutput-manager-x.h \
- $(components_dir)/x-videooutput/videooutput-main-x.cpp \
- $(components_dir)/x-videooutput/videooutput-main-x.h
+ engine/components/x-videooutput/videooutput-manager-x.cpp \
+ engine/components/x-videooutput/videooutput-manager-x.h \
+ engine/components/x-videooutput/videooutput-main-x.cpp \
+ engine/components/x-videooutput/videooutput-main-x.h
endif
@@ -685,10 +682,10 @@ endif
if HAVE_DX
libekiga_la_SOURCES += \
- $(components_dir)/dx-videooutput/videooutput-manager-dx.cpp \
- $(components_dir)/dx-videooutput/videooutput-manager-dx.h \
- $(components_dir)/dx-videooutput/videooutput-main-dx.cpp \
- $(components_dir)/dx-videooutput/videooutput-main-dx.h
+ engine/components/dx-videooutput/videooutput-manager-dx.cpp \
+ engine/components/dx-videooutput/videooutput-manager-dx.h \
+ engine/components/dx-videooutput/videooutput-main-dx.cpp \
+ engine/components/dx-videooutput/videooutput-main-dx.h
libekiga_la_LDFLAGS += $(DX_LIBS)
endif
diff --git a/plugins/avahi/Makefile.am b/plugins/avahi/Makefile.am
index 404d78c..fa6701f 100644
--- a/plugins/avahi/Makefile.am
+++ b/plugins/avahi/Makefile.am
@@ -1,7 +1,5 @@
plugin_LTLIBRARIES = libgmavahi.la
-avahi_dir = $(top_srcdir)/plugins/avahi
-
AM_CXXFLAGS = \
$(BOOST_CPPFLAGS) $(AVAHI_CFLAGS) \
-I$(top_srcdir)/lib/engine/framework \
@@ -10,13 +8,13 @@ AM_CXXFLAGS = \
-I$(top_srcdir)/lib/engine/protocol
libgmavahi_la_SOURCES = \
- $(avahi_dir)/avahi-main.cpp \
- $(avahi_dir)/avahi-publisher.cpp \
- $(avahi_dir)/avahi-publisher.h \
- $(avahi_dir)/avahi-heap.h \
- $(avahi_dir)/avahi-heap.cpp \
- $(avahi_dir)/avahi-cluster.h \
- $(avahi_dir)/avahi-cluster.cpp
+ avahi-main.cpp \
+ avahi-publisher.cpp \
+ avahi-publisher.h \
+ avahi-heap.h \
+ avahi-heap.cpp \
+ avahi-cluster.h \
+ avahi-cluster.cpp
libgmavahi_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
libgmavahi_la_LIBADD = \
diff --git a/plugins/evolution/Makefile.am b/plugins/evolution/Makefile.am
index 368b230..aa253fd 100644
--- a/plugins/evolution/Makefile.am
+++ b/plugins/evolution/Makefile.am
@@ -1,21 +1,19 @@
plugin_LTLIBRARIES = libgmevolution.la
-evolution_dir = $(top_srcdir)/plugins/evolution
-
AM_CXXFLAGS = \
$(BOOST_CPPFLAGS) $(EDS_CFLAGS) $(GLIB_CFLAGS) \
-I$(top_srcdir)/lib/engine/framework \
-I$(top_srcdir)/lib/engine/addressbook
libgmevolution_la_SOURCES = \
- $(evolution_dir)/evolution-contact.h \
- $(evolution_dir)/evolution-contact.cpp \
- $(evolution_dir)/evolution-book.h \
- $(evolution_dir)/evolution-book.cpp \
- $(evolution_dir)/evolution-source.h \
- $(evolution_dir)/evolution-source.cpp \
- $(evolution_dir)/evolution-main.h \
- $(evolution_dir)/evolution-main.cpp
+ evolution-contact.h \
+ evolution-contact.cpp \
+ evolution-book.h \
+ evolution-book.cpp \
+ evolution-source.h \
+ evolution-source.cpp \
+ evolution-main.h \
+ evolution-main.cpp
libgmevolution_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
libgmevolution_la_LIBADD = \
diff --git a/plugins/gstreamer/Makefile.am b/plugins/gstreamer/Makefile.am
index cd7f673..7dd5ec1 100644
--- a/plugins/gstreamer/Makefile.am
+++ b/plugins/gstreamer/Makefile.am
@@ -1,7 +1,5 @@
plugin_LTLIBRARIES = libgmgstreamer.la
-gstreamer_dir = $(top_srcdir)/plugins/gstreamer/
-
AM_CXXFLAGS = \
$(BOOST_CPPFLAGS) $(GSTREAMER_CFLAGS) $(PTLIB_CFLAGS) \
-I$(top_srcdir)/lib/gmconf \
@@ -14,16 +12,16 @@ AM_CXXFLAGS = \
-I$(top_srcdir)/lib/engine/hal
libgmgstreamer_la_SOURCES = \
- $(gstreamer_dir)/gst-helper.h \
- $(gstreamer_dir)/gst-helper.cpp \
- $(gstreamer_dir)/gst-main.h \
- $(gstreamer_dir)/gst-main.cpp \
- $(gstreamer_dir)/gst-videoinput.h \
- $(gstreamer_dir)/gst-videoinput.cpp \
- $(gstreamer_dir)/gst-audioinput.h \
- $(gstreamer_dir)/gst-audioinput.cpp \
- $(gstreamer_dir)/gst-audiooutput.h \
- $(gstreamer_dir)/gst-audiooutput.cpp
+ gst-helper.h \
+ gst-helper.cpp \
+ gst-main.h \
+ gst-main.cpp \
+ gst-videoinput.h \
+ gst-videoinput.cpp \
+ gst-audioinput.h \
+ gst-audioinput.cpp \
+ gst-audiooutput.h \
+ gst-audiooutput.cpp
libgmgstreamer_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
libgmgstreamer_la_LIBADD = \
diff --git a/plugins/kab/Makefile.am b/plugins/kab/Makefile.am
index 4275411..1e0b60f 100644
--- a/plugins/kab/Makefile.am
+++ b/plugins/kab/Makefile.am
@@ -1,21 +1,19 @@
plugin_LTLIBRARIES = libgmkab.la
-kab_dir = $(top_srcdir)/plugins/kab
-
AM_CPPFLAGS = \
$(BOOST_CPPFLAGS) $(KAB_CFLAGS) \
-I$(top_srcdir)/lib/engine/framework \
-I$(top_srcdir)/lib/engine/addressbook
libgmkab_la_SOURCES = \
- $(kab_dir)/kab-contact.h \
- $(kab_dir)/kab-contact.cpp \
- $(kab_dir)/kab-book.h \
- $(kab_dir)/kab-book.cpp \
- $(kab_dir)/kab-source.h \
- $(kab_dir)/kab-source.cpp \
- $(kab_dir)/kab-main.h \
- $(kab_dir)/kab-main.cpp
+ kab-contact.h \
+ kab-contact.cpp \
+ kab-book.h \
+ kab-book.cpp \
+ kab-source.h \
+ kab-source.cpp \
+ kab-main.h \
+ kab-main.cpp
libgmkab_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
libgmkab_la_LIBADD = \
diff --git a/plugins/kde/Makefile.am b/plugins/kde/Makefile.am
index e0bee3d..600695e 100644
--- a/plugins/kde/Makefile.am
+++ b/plugins/kde/Makefile.am
@@ -1,14 +1,12 @@
plugin_LTLIBRARIES = libgmkde.la
-kde_dir = $(top_srcdir)/plugins/kde
-
AM_CXXFLAGS = \
$(BOOST_CPPFLAGS) $(KDE_CFLAGS) \
-I$(top_srcdir)/lib/engine/framework
libgmkde_la_SOURCES = \
- $(kde_dir)/kde-main.h \
- $(kde_dir)/kde-main.cpp
+ kde-main.h \
+ kde-main.cpp
libgmkde_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
libgmkde_la_LIBADD = \
diff --git a/plugins/ldap/Makefile.am b/plugins/ldap/Makefile.am
index eb8d952..5bf7daa 100644
--- a/plugins/ldap/Makefile.am
+++ b/plugins/ldap/Makefile.am
@@ -1,7 +1,5 @@
plugin_LTLIBRARIES = libgmldap.la
-ldap_dir = $(top_srcdir)/plugins/ldap
-
AM_CPPFLAGS = \
$(LDAP_CFLAGS) $(BOOST_CPPFLAGS) $(GLIB_CFLAGS) $(XML_CFLAGS) \
-I$(top_srcdir)/lib/gmconf \
@@ -9,14 +7,14 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/lib/engine/addressbook
libgmldap_la_SOURCES = \
- $(ldap_dir)/ldap-contact.h \
- $(ldap_dir)/ldap-contact.cpp \
- $(ldap_dir)/ldap-book.h \
- $(ldap_dir)/ldap-book.cpp \
- $(ldap_dir)/ldap-source.h \
- $(ldap_dir)/ldap-source.cpp \
- $(ldap_dir)/ldap-main.h \
- $(ldap_dir)/ldap-main.cpp
+ ldap-contact.h \
+ ldap-contact.cpp \
+ ldap-book.h \
+ ldap-book.cpp \
+ ldap-source.h \
+ ldap-source.cpp \
+ ldap-main.h \
+ ldap-main.cpp
libgmldap_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
diff --git a/plugins/libnotify/Makefile.am b/plugins/libnotify/Makefile.am
index eb9b6e8..df0a841 100644
--- a/plugins/libnotify/Makefile.am
+++ b/plugins/libnotify/Makefile.am
@@ -1,7 +1,5 @@
plugin_LTLIBRARIES = libgmlibnotify.la
-libnotify_dir = $(top_srcdir)/plugins/libnotify
-
AM_CXXFLAGS = \
$(BOOST_CPPFLAGS) $(NOTIFY_CFLAGS) \
-I$(top_srcdir)/lib/engine/framework \
@@ -9,7 +7,7 @@ AM_CXXFLAGS = \
-I$(top_srcdir)/lib/engine/protocol
libgmlibnotify_la_SOURCES = \
- $(libnotify_dir)/libnotify-main.cpp
+ libnotify-main.cpp
libgmlibnotify_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
libgmlibnotify_la_LIBADD = \
diff --git a/plugins/loudmouth/Makefile.am b/plugins/loudmouth/Makefile.am
index 82e672d..6613bc2 100644
--- a/plugins/loudmouth/Makefile.am
+++ b/plugins/loudmouth/Makefile.am
@@ -1,7 +1,5 @@
plugin_LTLIBRARIES = libgmloudmouth.la
-loudmouth_dir = $(top_srcdir)/plugins/loudmouth
-
AM_CXXFLAGS = \
$(BOOST_CPPFLAGS) $(XML_CFLAGS) $(LOUDMOUTH_CFLAGS) \
-I$(top_srcdir)/lib/gmconf \
@@ -11,26 +9,26 @@ AM_CXXFLAGS = \
-I$(top_srcdir)/lib/engine/chat
libgmloudmouth_la_SOURCES = \
- $(loudmouth_dir)/loudmouth-main.cpp \
- $(loudmouth_dir)/loudmouth-handler.h \
- $(loudmouth_dir)/loudmouth-helpers.h \
- $(loudmouth_dir)/loudmouth-helpers.cpp \
- $(loudmouth_dir)/loudmouth-bank.h \
- $(loudmouth_dir)/loudmouth-bank.cpp \
- $(loudmouth_dir)/loudmouth-account.h \
- $(loudmouth_dir)/loudmouth-account.cpp \
- $(loudmouth_dir)/loudmouth-cluster.h \
- $(loudmouth_dir)/loudmouth-cluster.cpp \
- $(loudmouth_dir)/loudmouth-heap-roster.h \
- $(loudmouth_dir)/loudmouth-heap-roster.cpp \
- $(loudmouth_dir)/loudmouth-presentity.h \
- $(loudmouth_dir)/loudmouth-presentity.cpp \
- $(loudmouth_dir)/loudmouth-chat-simple.h \
- $(loudmouth_dir)/loudmouth-chat-simple.cpp \
- $(loudmouth_dir)/loudmouth-chat-multiple.h \
- $(loudmouth_dir)/loudmouth-chat-multiple.cpp \
- $(loudmouth_dir)/loudmouth-dialect.h \
- $(loudmouth_dir)/loudmouth-dialect.cpp
+ loudmouth-main.cpp \
+ loudmouth-handler.h \
+ loudmouth-helpers.h \
+ loudmouth-helpers.cpp \
+ loudmouth-bank.h \
+ loudmouth-bank.cpp \
+ loudmouth-account.h \
+ loudmouth-account.cpp \
+ loudmouth-cluster.h \
+ loudmouth-cluster.cpp \
+ loudmouth-heap-roster.h \
+ loudmouth-heap-roster.cpp \
+ loudmouth-presentity.h \
+ loudmouth-presentity.cpp \
+ loudmouth-chat-simple.h \
+ loudmouth-chat-simple.cpp \
+ loudmouth-chat-multiple.h \
+ loudmouth-chat-multiple.cpp \
+ loudmouth-dialect.h \
+ loudmouth-dialect.cpp
libgmloudmouth_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
libgmloudmouth_la_LIBADD = \
diff --git a/plugins/resource-list/Makefile.am b/plugins/resource-list/Makefile.am
index d561ecf..77a31a9 100644
--- a/plugins/resource-list/Makefile.am
+++ b/plugins/resource-list/Makefile.am
@@ -1,7 +1,5 @@
plugin_LTLIBRARIES = libgmresource_list.la
-resource_list_dir = $(top_srcdir)/plugins/resource-list
-
AM_CXXFLAGS = \
$(BOOST_CPPFLAGS) $(GLIB_CFLAGS) $(XML_CFLAGS) \
-I$(top_srcdir)/lib/gmconf \
@@ -11,20 +9,20 @@ AM_CXXFLAGS = \
-I$(top_srcdir)/plugins/xcap
libgmresource_list_la_SOURCES = \
- $(resource_list_dir)/resource-list-main.h \
- $(resource_list_dir)/resource-list-main.cpp \
- $(resource_list_dir)/rl-presentity.h \
- $(resource_list_dir)/rl-presentity.cpp \
- $(resource_list_dir)/rl-entry.h \
- $(resource_list_dir)/rl-entry.cpp \
- $(resource_list_dir)/rl-entry-ref.h \
- $(resource_list_dir)/rl-entry-ref.cpp \
- $(resource_list_dir)/rl-list.h \
- $(resource_list_dir)/rl-list.cpp \
- $(resource_list_dir)/rl-heap.h \
- $(resource_list_dir)/rl-heap.cpp \
- $(resource_list_dir)/rl-cluster.h \
- $(resource_list_dir)/rl-cluster.cpp
+ resource-list-main.h \
+ resource-list-main.cpp \
+ rl-presentity.h \
+ rl-presentity.cpp \
+ rl-entry.h \
+ rl-entry.cpp \
+ rl-entry-ref.h \
+ rl-entry-ref.cpp \
+ rl-list.h \
+ rl-list.cpp \
+ rl-heap.h \
+ rl-heap.cpp \
+ rl-cluster.h \
+ rl-cluster.cpp
libgmresource_list_la_LDFLAGS = \
-L$(top_builddir)/plugins/xcap \
diff --git a/plugins/xcap/Makefile.am b/plugins/xcap/Makefile.am
index a870455..a05ecaa 100644
--- a/plugins/xcap/Makefile.am
+++ b/plugins/xcap/Makefile.am
@@ -1,18 +1,16 @@
plugin_LTLIBRARIES = libgmxcap.la
-xcap_dir = $(top_srcdir)/plugins/xcap
-
AM_CXXFLAGS = \
$(BOOST_CPPFLAGS) $(SOUP_CFLAGS) \
-I$(top_srcdir)/lib/engine/framework
libgmxcap_la_SOURCES = \
- $(xcap_dir)/xcap-path.h \
- $(xcap_dir)/xcap-path.cpp \
- $(xcap_dir)/xcap-core.h \
- $(xcap_dir)/xcap-core.cpp \
- $(xcap_dir)/xcap-main.h \
- $(xcap_dir)/xcap-main.cpp
+ xcap-path.h \
+ xcap-path.cpp \
+ xcap-core.h \
+ xcap-core.cpp \
+ xcap-main.h \
+ xcap-main.cpp
libgmxcap_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
libgmxcap_la_LIBADD = \
diff --git a/src/Makefile.am b/src/Makefile.am
index f74faf3..d725009 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -65,8 +65,8 @@ ekiga_SOURCES += \
# resources
if WIN32
ekiga_SOURCES += \
- $(top_srcdir)/win32/plugin-gconst.cpp \
- $(top_srcdir)/win32/ekiga-rc.rc
+ ../win32/plugin-gconst.cpp \
+ ../win32/ekiga-rc.rc
endif
if HAVE_DBUS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
