move inc/ and lib/ to src/. No code changes

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>

1 files changed, 43 insertions, 42 deletions

diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index f213804e..8a8a6f30 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -1,5 +1,5 @@
-INC_PATH=$(srcdir)/../../inc
-UTILS_PATH=$(srcdir)/../../lib/utils
+INC_PATH=$(srcdir)/../include
+UTILS_PATH=$(srcdir)/../lib
 AM_CPPFLAGS = -I$(INC_PATH) -I$(UTILS_PATH)
 pluginslibdir=$(PLUGINS_LIB_DIR)
 libexec_SCRIPTS = \
@@ -54,7 +54,8 @@ install-data-hook: $(DESTDIR)/$(DEBUG_INFO_DIR)
 libCCpp_la_SOURCES = CCpp.cpp CCpp.h
 libCCpp_la_LDFLAGS = -avoid-version
 libCCpp_la_CPPFLAGS = -Wall -Werror \
-    -I$(INC_PATH) -I$(UTILS_PATH) \
+    -I$(INC_PATH) \
+    -I$(UTILS_PATH) \
     -DCCPP_HOOK_PATH=\"${libexecdir}/abrt-hook-ccpp\" \
     -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
     -DLOCALSTATEDIR='"$(localstatedir)"'
@@ -86,8 +87,8 @@ libexec_PROGRAMS = \
 abrt_action_analyze_c_SOURCES = \
     abrt-action-analyze-c.c
 abrt_action_analyze_c_CPPFLAGS = \
-    -I$(srcdir)/../../inc \
-    -I$(srcdir)/../../lib/utils \
+    -I$(srcdir)/../include \
+    -I$(srcdir)/../lib \
     -DBIN_DIR=\"$(bindir)\" \
     -DVAR_RUN=\"$(VAR_RUN)\" \
     -DCONF_DIR=\"$(CONF_DIR)\" \
@@ -99,13 +100,13 @@ abrt_action_analyze_c_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_analyze_c_LDADD = \
-    ../../lib/utils/libABRTUtils.la
+    ../lib/libABRTUtils.la
 
 abrt_action_analyze_python_SOURCES = \
     abrt-action-analyze-python.c
 abrt_action_analyze_python_CPPFLAGS = \
-    -I$(srcdir)/../../inc \
-    -I$(srcdir)/../../lib/utils \
+    -I$(srcdir)/../include \
+    -I$(srcdir)/../lib \
     -DBIN_DIR=\"$(bindir)\" \
     -DVAR_RUN=\"$(VAR_RUN)\" \
     -DCONF_DIR=\"$(CONF_DIR)\" \
@@ -117,13 +118,13 @@ abrt_action_analyze_python_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_analyze_python_LDADD = \
-    ../../lib/utils/libABRTUtils.la
+    ../lib/libABRTUtils.la
 
 abrt_action_analyze_oops_SOURCES = \
     abrt-action-analyze-oops.c
 abrt_action_analyze_oops_CPPFLAGS = \
-    -I$(srcdir)/../../inc \
-    -I$(srcdir)/../../lib/utils \
+    -I$(srcdir)/../include \
+    -I$(srcdir)/../lib \
     -DBIN_DIR=\"$(bindir)\" \
     -DVAR_RUN=\"$(VAR_RUN)\" \
     -DCONF_DIR=\"$(CONF_DIR)\" \
@@ -135,13 +136,13 @@ abrt_action_analyze_oops_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_analyze_oops_LDADD = \
-    ../../lib/utils/libABRTUtils.la
+    ../lib/libABRTUtils.la
 
 abrt_action_generate_backtrace_SOURCES = \
     abrt-action-generate-backtrace.c
 abrt_action_generate_backtrace_CPPFLAGS = \
-    -I$(srcdir)/../../inc \
-    -I$(srcdir)/../../lib/utils \
+    -I$(srcdir)/../include \
+    -I$(srcdir)/../lib \
     -DBIN_DIR=\"$(bindir)\" \
     -DVAR_RUN=\"$(VAR_RUN)\" \
     -DCONF_DIR=\"$(CONF_DIR)\" \
@@ -153,14 +154,14 @@ abrt_action_generate_backtrace_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_generate_backtrace_LDADD = \
-    ../../lib/utils/libABRTUtils.la \
+    ../lib/libABRTUtils.la \
     ../btparser/libbtparser.la
 
 abrt_action_bugzilla_SOURCES = \
     abrt-action-bugzilla.cpp
 abrt_action_bugzilla_CPPFLAGS = \
-    -I$(srcdir)/../../inc \
-    -I$(srcdir)/../../lib/utils \
+    -I$(srcdir)/../include \
+    -I$(srcdir)/../lib \
     -DBIN_DIR=\"$(bindir)\" \
     -DVAR_RUN=\"$(VAR_RUN)\" \
     -DCONF_DIR=\"$(CONF_DIR)\" \
@@ -174,16 +175,16 @@ abrt_action_bugzilla_CPPFLAGS = \
     -Wall -Werror
 abrt_action_bugzilla_LDADD = \
     $(GLIB_LIBS) \
-    ../../lib/utils/libABRT_web_utils.la \
-    ../../lib/utils/libABRTdUtils.la \
-    ../../lib/utils/libABRTUtils.la
+    ../lib/libABRT_web_utils.la \
+    ../lib/libABRTdUtils.la \
+    ../lib/libABRTUtils.la
 
 abrt_action_rhtsupport_SOURCES = \
     abrt_rh_support.h abrt_rh_support.c \
     abrt-action-rhtsupport.cpp
 abrt_action_rhtsupport_CPPFLAGS = \
-    -I$(srcdir)/../../inc \
-    -I$(srcdir)/../../lib/utils \
+    -I$(srcdir)/../include \
+    -I$(srcdir)/../lib \
     -DBIN_DIR=\"$(bindir)\" \
     -DVAR_RUN=\"$(VAR_RUN)\" \
     -DCONF_DIR=\"$(CONF_DIR)\" \
@@ -200,15 +201,15 @@ abrt_action_rhtsupport_LDFLAGS = -ltar
 abrt_action_rhtsupport_LDADD = \
     $(GLIB_LIBS) \
     $(XMLRPC_LIBS) $(XMLRPC_CLIENT_LIBS) \
-    ../../lib/utils/libABRT_web_utils.la \
-    ../../lib/utils/libABRTdUtils.la \
-    ../../lib/utils/libABRTUtils.la
+    ../lib/libABRT_web_utils.la \
+    ../lib/libABRTdUtils.la \
+    ../lib/libABRTUtils.la
 
 abrt_action_upload_SOURCES = \
     abrt-action-upload.cpp
 abrt_action_upload_CPPFLAGS = \
-    -I$(srcdir)/../../inc \
-    -I$(srcdir)/../../lib/utils \
+    -I$(srcdir)/../include \
+    -I$(srcdir)/../lib \
     -DBIN_DIR=\"$(bindir)\" \
     -DVAR_RUN=\"$(VAR_RUN)\" \
     -DCONF_DIR=\"$(CONF_DIR)\" \
@@ -226,14 +227,14 @@ abrt_action_upload_LDFLAGS = -ltar
 abrt_action_upload_LDADD = \
     $(GLIB_LIBS) \
     $(CURL_LIBS) \
-    ../../lib/utils/libABRTdUtils.la \
-    ../../lib/utils/libABRTUtils.la
+    ../lib/libABRTdUtils.la \
+    ../lib/libABRTUtils.la
 
 abrt_action_kerneloops_SOURCES = \
     abrt-action-kerneloops.cpp
 abrt_action_kerneloops_CPPFLAGS = \
-    -I$(srcdir)/../../inc \
-    -I$(srcdir)/../../lib/utils \
+    -I$(srcdir)/../include \
+    -I$(srcdir)/../lib \
     -DBIN_DIR=\"$(bindir)\" \
     -DVAR_RUN=\"$(VAR_RUN)\" \
     -DCONF_DIR=\"$(CONF_DIR)\" \
@@ -247,15 +248,15 @@ abrt_action_kerneloops_CPPFLAGS = \
     -Wall -Werror
 # libABRTdUtils is used only because of LoadPluginSettings:
 abrt_action_kerneloops_LDADD = \
-    ../../lib/utils/libABRT_web_utils.la \
-    ../../lib/utils/libABRTdUtils.la \
-    ../../lib/utils/libABRTUtils.la
+    ../lib/libABRT_web_utils.la \
+    ../lib/libABRTdUtils.la \
+    ../lib/libABRTUtils.la
 
 abrt_action_mailx_SOURCES = \
     abrt-action-mailx.cpp
 abrt_action_mailx_CPPFLAGS = \
-    -I$(srcdir)/../../inc \
-    -I$(srcdir)/../../lib/utils \
+    -I$(srcdir)/../include \
+    -I$(srcdir)/../lib \
     -DBIN_DIR=\"$(bindir)\" \
     -DVAR_RUN=\"$(VAR_RUN)\" \
     -DCONF_DIR=\"$(CONF_DIR)\" \
@@ -268,14 +269,14 @@ abrt_action_mailx_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_mailx_LDADD = \
-    ../../lib/utils/libABRTdUtils.la \
-    ../../lib/utils/libABRTUtils.la
+    ../lib/libABRTdUtils.la \
+    ../lib/libABRTUtils.la
 
 abrt_action_print_SOURCES = \
     abrt-action-print.cpp
 abrt_action_print_CPPFLAGS = \
-    -I$(srcdir)/../../inc \
-    -I$(srcdir)/../../lib/utils \
+    -I$(srcdir)/../include \
+    -I$(srcdir)/../lib \
     -DBIN_DIR=\"$(bindir)\" \
     -DVAR_RUN=\"$(VAR_RUN)\" \
     -DCONF_DIR=\"$(CONF_DIR)\" \
@@ -289,7 +290,7 @@ abrt_action_print_CPPFLAGS = \
     -Wall -Werror
 # libABRTdUtils is used only because of make_description_logger:
 abrt_action_print_LDADD = \
-    ../../lib/utils/libABRTdUtils.la \
-    ../../lib/utils/libABRTUtils.la
+    ../lib/libABRTdUtils.la \
+    ../lib/libABRTUtils.la
 
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@