summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikola Pajkovsky <npajkovs@redhat.com>2010-05-14 11:48:13 +0200
committerNikola Pajkovsky <npajkovs@redhat.com>2010-05-14 11:48:13 +0200
commit78f9a6d82fb7b5e7f714f0c348980d0809922645 (patch)
treef450f3fedb588bfd3ba4fe8cebd9a5ff44e9c8e4
parentdbc085851b8084f68622c309011c16e020913896 (diff)
downloadabrt-78f9a6d82fb7b5e7f714f0c348980d0809922645.tar.gz
abrt-78f9a6d82fb7b5e7f714f0c348980d0809922645.tar.xz
abrt-78f9a6d82fb7b5e7f714f0c348980d0809922645.zip
Revert "Move hooklib from src/Hooks to lib/Utils"
This reverts commit 94a67f5d3edd6ac842cc3d7feea9e1954ee58a37.
-rw-r--r--lib/Utils/Makefile.am3
-rw-r--r--src/Hooks/Makefile.am11
-rw-r--r--src/Hooks/hooklib.cpp (renamed from lib/Utils/hooklib.cpp)0
-rw-r--r--src/Hooks/hooklib.h (renamed from lib/Utils/hooklib.h)0
4 files changed, 9 insertions, 5 deletions
diff --git a/lib/Utils/Makefile.am b/lib/Utils/Makefile.am
index f9979ec0..13144f68 100644
--- a/lib/Utils/Makefile.am
+++ b/lib/Utils/Makefile.am
@@ -26,8 +26,7 @@ libABRTUtils_la_SOURCES = \
ABRTException.cpp \
backtrace.h backtrace.c \
backtrace_parser.y \
- strbuf.h strbuf.c \
- hooklib.h hooklib.cpp
+ strbuf.h strbuf.c
libABRTUtils_la_CPPFLAGS = \
-Wall -Werror \
-I$(srcdir)/../../inc \
diff --git a/src/Hooks/Makefile.am b/src/Hooks/Makefile.am
index ef4ab821..6845c72c 100644
--- a/src/Hooks/Makefile.am
+++ b/src/Hooks/Makefile.am
@@ -2,7 +2,9 @@ libexec_PROGRAMS = abrt-hook-ccpp abrt-hook-python
bin_PROGRAMS = dumpoops
# abrt-hook-ccpp
-abrt_hook_ccpp_SOURCES = abrt-hook-ccpp.cpp
+abrt_hook_ccpp_SOURCES = \
+ abrt-hook-ccpp.cpp \
+ hooklib.h hooklib.cpp
abrt_hook_ccpp_CPPFLAGS = \
-I$(srcdir)/../../inc \
-I$(srcdir)/../../lib/Utils \
@@ -14,7 +16,8 @@ abrt_hook_ccpp_LDADD = \
../../lib/Utils/libABRTUtils.la
# dumpoops
-dumpoops_SOURCES = dumpoops.cpp
+dumpoops_SOURCES = \
+ dumpoops.cpp
dumpoops_CPPFLAGS = \
-I$(srcdir)/../../inc \
-I$(srcdir)/../../lib/Utils \
@@ -31,7 +34,9 @@ dumpoops_LDADD = \
../../lib/Utils/libABRTdUtils.la
# abrt-hook-python
-abrt_hook_python_SOURCES = abrt-hook-python.cpp
+abrt_hook_python_SOURCES = \
+ abrt-hook-python.cpp \
+ hooklib.h hooklib.cpp
abrt_hook_python_CPPFLAGS = \
-I$(srcdir)/../../inc \
-I$(srcdir)/../../lib/Utils \
diff --git a/lib/Utils/hooklib.cpp b/src/Hooks/hooklib.cpp
index a722ef5f..a722ef5f 100644
--- a/lib/Utils/hooklib.cpp
+++ b/src/Hooks/hooklib.cpp
diff --git a/lib/Utils/hooklib.h b/src/Hooks/hooklib.h
index 0794ff60..0794ff60 100644
--- a/lib/Utils/hooklib.h
+++ b/src/Hooks/hooklib.h