diff options
| author | Jiri Moskovcak <jmoskovc@redhat.com> | 2009-08-06 16:19:07 +0200 |
|---|---|---|
| committer | Jiri Moskovcak <jmoskovc@redhat.com> | 2009-08-06 16:19:07 +0200 |
| commit | 84348ccea878d509f838927e1bf393e5443d3ac8 (patch) | |
| tree | d7dc8bdc80b18a6137f94415761ec95c1df8e005 /src/Applet | |
| parent | 9a3268d970142f0dfb4e3e77c66c9637bf87fbda (diff) | |
| parent | 26c6665308b5a99d02308099118b23b2716dacc0 (diff) | |
Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt
Conflicts:
lib/CommLayer/DBusServerProxy.h
Diffstat (limited to 'src/Applet')
| -rw-r--r-- | src/Applet/Applet.cpp | 34 | ||||
| -rw-r--r-- | src/Applet/Makefile.am | 25 |
2 files changed, 34 insertions, 25 deletions
diff --git a/src/Applet/Applet.cpp b/src/Applet/Applet.cpp index adcfb47..53f0043 100644 --- a/src/Applet/Applet.cpp +++ b/src/Applet/Applet.cpp @@ -1,20 +1,20 @@ -/* - Copyright (C) 2009 Jiri Moskovcak (jmoskovc@redhat.com) - Copyright (C) 2009 RedHat inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +/* + Copyright (C) 2009 Jiri Moskovcak (jmoskovc@redhat.com) + Copyright (C) 2009 RedHat inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "CCApplet.h" diff --git a/src/Applet/Makefile.am b/src/Applet/Makefile.am index 2665850..f0ec5ed 100644 --- a/src/Applet/Makefile.am +++ b/src/Applet/Makefile.am @@ -1,13 +1,22 @@ bin_PROGRAMS = abrt-applet -abrt_applet_SOURCES = Applet.cpp CCApplet.cpp CCApplet.h -abrt_applet_CPPFLAGS = -Wall -Werror -I../Daemon/ \ - -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \ - -DBIN_DIR=\"$(bindir)\" \ - $(DBUS_GLIB_CFLAGS) $(GTK_CFLAGS) $(DBUSCPP_CFLAGS) $(LIBNOTIFY_CFLAGS)\ - -I$(srcdir)/../../inc -I../../lib/CommLayer \ - -I../../lib/MiddleWare -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -abrt_applet_LDADD = $(DL_LIBS) $(GTK_LIBS) -lglib-2.0 -lgthread-2.0 $(DBUSCPP_LIBS) $(LIBNOTIFY_LIBS) +abrt_applet_SOURCES = Applet.cpp CCApplet.cpp CCApplet.h +abrt_applet_CPPFLAGS = \ + -Wall -Werror \ + -I../Daemon/ \ + -I$(srcdir)/../../inc \ + -I$(srcdir)/../../lib/CommLayer \ + -I$(srcdir)/../../lib/MiddleWare \ + -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \ + -DBIN_DIR=\"$(bindir)\" \ + $(DBUS_GLIB_CFLAGS) $(GTK_CFLAGS) $(DBUSCPP_CFLAGS) $(LIBNOTIFY_CFLAGS) \ + -I/usr/include/glib-2.0 \ + -I/usr/lib/glib-2.0/include +abrt_applet_LDADD = \ + ../../lib/CommLayer/libABRTCommLayer.la \ + $(DL_LIBS) $(GTK_LIBS) \ + -lglib-2.0 -lgthread-2.0 \ + $(DBUSCPP_LIBS) $(LIBNOTIFY_LIBS) EXTRA_DIST = abrt-applet.desktop |