summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-09-14 14:57:55 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2009-09-14 14:57:55 +0200
commit13483daa13d1b366fa9c7222361c094d3726f03e (patch)
tree0ca9c507072af60fd782f2e2ef2969a06519a12b
parentcc83804e6fb6b9b6534ea58003cd73d31968ca27 (diff)
downloadabrt-13483daa13d1b366fa9c7222361c094d3726f03e.tar.gz
abrt-13483daa13d1b366fa9c7222361c094d3726f03e.tar.xz
abrt-13483daa13d1b366fa9c7222361c094d3726f03e.zip
move lib/CommLayer/CommLayerClientDBus.{h,cpp) -> src/CLI
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--lib/CommLayer/Makefile.am1
-rw-r--r--src/Applet/CCApplet.h2
-rw-r--r--src/Applet/Makefile.am4
-rw-r--r--src/CLI/CommLayerClientDBus.cpp (renamed from lib/CommLayer/CommLayerClientDBus.cpp)0
-rw-r--r--src/CLI/CommLayerClientDBus.h (renamed from lib/CommLayer/CommLayerClientDBus.h)0
-rw-r--r--src/CLI/Makefile.am18
6 files changed, 15 insertions, 10 deletions
diff --git a/lib/CommLayer/Makefile.am b/lib/CommLayer/Makefile.am
index 74b3aa50..be0c52bf 100644
--- a/lib/CommLayer/Makefile.am
+++ b/lib/CommLayer/Makefile.am
@@ -3,7 +3,6 @@ lib_LTLIBRARIES = libABRTCommLayer.la
libABRTCommLayer_la_SOURCES = \
DBusClientProxy.h DBusClientProxy.cpp \
CommLayerInner.h CommLayerInner.cpp \
- CommLayerClientDBus.h CommLayerClientDBus.cpp \
Observer.h \
DBusCommon.h
libABRTCommLayer_la_LIBADD = \
diff --git a/src/Applet/CCApplet.h b/src/Applet/CCApplet.h
index dccd70b7..90a79e26 100644
--- a/src/Applet/CCApplet.h
+++ b/src/Applet/CCApplet.h
@@ -24,7 +24,7 @@
#include <map>
#include <string>
#include <DBusClientProxy.h>
-#include<libnotify/notify.h>
+#include <libnotify/notify.h>
class CApplet
: public CDBusClient_proxy,
diff --git a/src/Applet/Makefile.am b/src/Applet/Makefile.am
index 886102ff..5190649b 100644
--- a/src/Applet/Makefile.am
+++ b/src/Applet/Makefile.am
@@ -1,6 +1,8 @@
bin_PROGRAMS = abrt-applet
-abrt_applet_SOURCES = Applet.cpp CCApplet.cpp CCApplet.h
+abrt_applet_SOURCES = \
+ Applet.cpp \
+ CCApplet.h CCApplet.cpp
abrt_applet_CPPFLAGS = \
-Wall -Werror \
-I../Daemon/ \
diff --git a/lib/CommLayer/CommLayerClientDBus.cpp b/src/CLI/CommLayerClientDBus.cpp
index 77983463..77983463 100644
--- a/lib/CommLayer/CommLayerClientDBus.cpp
+++ b/src/CLI/CommLayerClientDBus.cpp
diff --git a/lib/CommLayer/CommLayerClientDBus.h b/src/CLI/CommLayerClientDBus.h
index 9e63f58c..9e63f58c 100644
--- a/lib/CommLayer/CommLayerClientDBus.h
+++ b/src/CLI/CommLayerClientDBus.h
diff --git a/src/CLI/Makefile.am b/src/CLI/Makefile.am
index 6900bda1..33daaae6 100644
--- a/src/CLI/Makefile.am
+++ b/src/CLI/Makefile.am
@@ -3,11 +3,15 @@
#abrt_cli_CPPFLAGS = -I$(srcdir)/../../inc -DVAR_RUN=\"$(VAR_RUN)\"
bin_PROGRAMS = abrt-cli
-abrt_cli_SOURCES = CLI.cpp ABRTSocket.cpp ABRTSocket.h
-abrt_cli_CPPFLAGS = $(DBUS_GLIB_CFLAGS) $(GTK_CFLAGS) $(DBUSCPP_CFLAGS) $(LIBNOTIFY_CFLAGS)\
- -I$(srcdir)/../../inc -DVAR_RUN=\"$(VAR_RUN)\" \
- -I$(srcdir)/../../lib/CommLayer \
- $(ENABLE_SOCKET_OR_DBUS) \
- -I../../lib/MiddleWare
+abrt_cli_SOURCES = \
+ CLI.cpp \
+ ABRTSocket.h ABRTSocket.cpp \
+ CommLayerClientDBus.h CommLayerClientDBus.cpp \
+abrt_cli_CPPFLAGS = \
+ $(DBUS_GLIB_CFLAGS) $(GTK_CFLAGS) $(DBUSCPP_CFLAGS) $(LIBNOTIFY_CFLAGS)\
+ -I$(srcdir)/../../inc -DVAR_RUN=\"$(VAR_RUN)\" \
+ -I$(srcdir)/../../lib/CommLayer \
+ $(ENABLE_SOCKET_OR_DBUS) \
+ -I../../lib/MiddleWare
-abrt_cli_LDADD = ../../lib/CommLayer/libABRTCommLayer.la \ No newline at end of file
+abrt_cli_LDADD = ../../lib/CommLayer/libABRTCommLayer.la