summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2025-03-06 12:07:10 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2025-03-06 12:13:17 +0900
commit7271fa27ac1881beb5326ca8c9c83471695d8487 (patch)
tree26e03d9ae5cf7278374041fd15d26970a32c1a2e
parentf4e18c1eacbc71a8f7dc0374317d99f86f9a8ca1 (diff)
downloadktorrent-7271fa27.tar.gz
ktorrent-7271fa27.zip
Fix wrong include paths in makefiles
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit d1f24dae035c506d945ca13f2be398aa0a4de8cc)
-rw-r--r--apps/ktorrent/Makefile.am3
-rw-r--r--apps/ktorrent/newui/Makefile.am4
-rw-r--r--libktorrent/torrent/Makefile.am3
-rw-r--r--plugins/stats/Makefile.am3
-rw-r--r--plugins/webinterface/Makefile.am4
-rw-r--r--plugins/zeroconf/Makefile.am3
6 files changed, 8 insertions, 12 deletions
diff --git a/apps/ktorrent/Makefile.am b/apps/ktorrent/Makefile.am
index 6a6d309..87182d1 100644
--- a/apps/ktorrent/Makefile.am
+++ b/apps/ktorrent/Makefile.am
@@ -7,8 +7,7 @@ bin_PROGRAMS = ktorrent
# set the include path for X, qt and KDE
-INCLUDES = -I$(top_builddir)/ktorrent/libktorrent -I$(top_builddir)/libktorrent/ -I$(srcdir)/../../libktorrent \
- $(all_includes)
+INCLUDES = -I$(top_srcdir)/libktorrent -I$(top_builddir)/libktorrent $(all_includes)
# the library search path.
ktorrent_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
diff --git a/apps/ktorrent/newui/Makefile.am b/apps/ktorrent/newui/Makefile.am
index bd136f3..6c6576b 100644
--- a/apps/ktorrent/newui/Makefile.am
+++ b/apps/ktorrent/newui/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES = -I$(srcdir)/../../libktorrent -I$(top_builddir)/ktorrent/libktorrent \
- -I$(top_builddir)/libktorrent/ $(all_includes)
+INCLUDES = -I$(top_srcdir)/libktorrent -I$(top_builddir)/libktorrent/ $(all_includes)
+
METASOURCES = AUTO
noinst_LTLIBRARIES = libnewui.la
libnewui_la_LDFLAGS = $(all_libraries)
diff --git a/libktorrent/torrent/Makefile.am b/libktorrent/torrent/Makefile.am
index d546228..5c28ab1 100644
--- a/libktorrent/torrent/Makefile.am
+++ b/libktorrent/torrent/Makefile.am
@@ -1,5 +1,4 @@
-INCLUDES = -I$(top_builddir)/ktorrent/libktorrent -I$(top_builddir)/libktorrent \
- -I$(srcdir)/.. $(all_includes)
+INCLUDES = -I$(top_srcdir)/libktorrent -I$(top_builddir)/libktorrent $(all_includes)
METASOURCES = AUTO
diff --git a/plugins/stats/Makefile.am b/plugins/stats/Makefile.am
index 5e73e62..5e0f760 100644
--- a/plugins/stats/Makefile.am
+++ b/plugins/stats/Makefile.am
@@ -1,5 +1,4 @@
-INCLUDES = -I$(top_builddir)/libktorrent -I$(top_builddir)/ktorrent/libktorrent \
- -I$(srcdir)/../../libktorrent $(all_includes)
+INCLUDES = -I$(top_srcdir)/libktorrent -I$(top_builddir)/libktorrent $(all_includes)
METASOURCES = AUTO
diff --git a/plugins/webinterface/Makefile.am b/plugins/webinterface/Makefile.am
index 1c2bf39..6626957 100644
--- a/plugins/webinterface/Makefile.am
+++ b/plugins/webinterface/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES = -I$(top_builddir)/libktorrent -I$(top_builddir)/ktorrent/libktorrent \
- -I$(srcdir)/../../libktorrent $(all_includes)
+INCLUDES = -I$(top_srcdir)/libktorrent -I$(top_builddir)/libktorrent $(all_includes)
+
METASOURCES = AUTO
kde_module_LTLIBRARIES = ktwebinterfaceplugin.la
noinst_HEADERS = webinterfaceplugin.h httpserver.h php_handler.h \
diff --git a/plugins/zeroconf/Makefile.am b/plugins/zeroconf/Makefile.am
index ba959bc..0fb602a 100644
--- a/plugins/zeroconf/Makefile.am
+++ b/plugins/zeroconf/Makefile.am
@@ -1,5 +1,4 @@
-INCLUDES = -I$(top_builddir)/libktorrent -I$(top_builddir)/ktorrent/libktorrent \
- -I$(srcdir)/../../libktorrent $(all_includes)
+INCLUDES = -I$(top_srcdir)/libktorrent -I$(top_builddir)/libktorrent $(all_includes)
METASOURCES = AUTO