aboutsummaryrefslogtreecommitdiffstats
path: root/camel/providers
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2003-02-06 06:34:18 +0800
committerDan Winship <danw@src.gnome.org>2003-02-06 06:34:18 +0800
commit3e0211a7d2b5a6b585f53addff3bc24f7cfb73b0 (patch)
tree32dfa2f1652652e3029732673c0d1b5b1aad3540 /camel/providers
parentfefb7820db99e63564395beeec82949ccb0e3b9f (diff)
downloadgsoc2013-evolution-3e0211a7d2b5a6b585f53addff3bc24f7cfb73b0.tar
gsoc2013-evolution-3e0211a7d2b5a6b585f53addff3bc24f7cfb73b0.tar.gz
gsoc2013-evolution-3e0211a7d2b5a6b585f53addff3bc24f7cfb73b0.tar.bz2
gsoc2013-evolution-3e0211a7d2b5a6b585f53addff3bc24f7cfb73b0.tar.lz
gsoc2013-evolution-3e0211a7d2b5a6b585f53addff3bc24f7cfb73b0.tar.xz
gsoc2013-evolution-3e0211a7d2b5a6b585f53addff3bc24f7cfb73b0.tar.zst
gsoc2013-evolution-3e0211a7d2b5a6b585f53addff3bc24f7cfb73b0.zip
Define in terms of privincludedir. (camellibexecdir): Define in terms of
* Makefile.am (libcamelincludedir): Define in terms of privincludedir. (camellibexecdir): Define in terms of privlibexecdir (libcamel_la_LDFLAGS): Remove -rpath. (automake will add that) * providers/imap/Makefile.am (libcamelimapincludedir): Define in terms of privincludedir. (INCLUDES): Remove -I$(includedir) * providers/local/Makefile.am: Likewise * providers/nntp/Makefile.am: Likewise * providers/pop3/Makefile.am: Likewise * providers/sendmail/Makefile.am: Likewise * providers/smtp/Makefile.am: Likewise svn path=/trunk/; revision=19775
Diffstat (limited to 'camel/providers')
-rw-r--r--camel/providers/imap/Makefile.am3
-rw-r--r--camel/providers/local/Makefile.am3
-rw-r--r--camel/providers/nntp/Makefile.am3
-rw-r--r--camel/providers/pop3/Makefile.am3
-rw-r--r--camel/providers/sendmail/Makefile.am3
-rw-r--r--camel/providers/smtp/Makefile.am3
6 files changed, 6 insertions, 12 deletions
diff --git a/camel/providers/imap/Makefile.am b/camel/providers/imap/Makefile.am
index d6ca625822..78ca84dacd 100644
--- a/camel/providers/imap/Makefile.am
+++ b/camel/providers/imap/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-libcamelimapincludedir = $(includedir)/evolution-$(BASE_VERSION)/camel
+libcamelimapincludedir = $(privincludedir)/camel
camel_provider_LTLIBRARIES = libcamelimap.la
camel_provider_DATA = libcamelimap.urls
@@ -11,7 +11,6 @@ INCLUDES = -I.. \
-I$(top_srcdir)/intl \
-I$(top_srcdir)/e-util \
-I$(top_srcdir) \
- -I$(includedir) \
$(CAMEL_CFLAGS) \
$(GNOME_INCLUDEDIR) \
$(GTK_INCLUDEDIR) \
diff --git a/camel/providers/local/Makefile.am b/camel/providers/local/Makefile.am
index ee2d4dfe8c..203e7262d1 100644
--- a/camel/providers/local/Makefile.am
+++ b/camel/providers/local/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-libcamellocalincludedir = $(includedir)/evolution-$(BASE_VERSION)/camel
+libcamellocalincludedir = $(privincludedir)/camel
camel_provider_LTLIBRARIES = libcamellocal.la
camel_provider_DATA = libcamellocal.urls
@@ -11,7 +11,6 @@ INCLUDES = -I.. \
-I$(top_srcdir)/intl \
-I$(top_srcdir)/e-util \
-I$(top_srcdir) \
- -I$(includedir) \
$(CAMEL_CFLAGS) \
$(GNOME_INCLUDEDIR) \
$(GTK_INCLUDEDIR) \
diff --git a/camel/providers/nntp/Makefile.am b/camel/providers/nntp/Makefile.am
index 505cfb0ab4..77a10c8e9e 100644
--- a/camel/providers/nntp/Makefile.am
+++ b/camel/providers/nntp/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-libcamelnntpincludedir = $(includedir)/evolution-$(BASE_VERSION)/camel
+libcamelnntpincludedir = $(privincludedir)/camel
camel_provider_LTLIBRARIES = libcamelnntp.la
camel_provider_DATA = libcamelnntp.urls
@@ -10,7 +10,6 @@ INCLUDES = -I../.. \
-I$(top_srcdir)/intl \
-I$(top_srcdir)/e-util \
-I$(top_srcdir) \
- -I$(includedir) \
$(CAMEL_CFLAGS) \
$(GNOME_INCLUDEDIR) \
$(GTK_INCLUDEDIR) \
diff --git a/camel/providers/pop3/Makefile.am b/camel/providers/pop3/Makefile.am
index cf7369b6b5..b5e210df28 100644
--- a/camel/providers/pop3/Makefile.am
+++ b/camel/providers/pop3/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-libcamelpop3includedir = $(includedir)/evolution-$(BASE_VERSION)/camel
+libcamelpop3includedir = $(privincludedir)/camel
camel_provider_LTLIBRARIES = libcamelpop3.la
camel_provider_DATA = libcamelpop3.urls
@@ -9,7 +9,6 @@ INCLUDES = \
-I.. \
-I$(srcdir)/.. \
-I$(srcdir)/../../.. \
- -I$(includedir) \
-I$(top_srcdir)/intl \
-I$(top_srcdir)/camel \
-I$(top_srcdir)/e-util \
diff --git a/camel/providers/sendmail/Makefile.am b/camel/providers/sendmail/Makefile.am
index 59c6bdb927..71c0a191fe 100644
--- a/camel/providers/sendmail/Makefile.am
+++ b/camel/providers/sendmail/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-libcamelsendmailincludedir = $(includedir)/evolution-$(BASE_VERSION)/camel
+libcamelsendmailincludedir = $(privincludedir)/camel
camel_provider_LTLIBRARIES = libcamelsendmail.la
camel_provider_DATA = libcamelsendmail.urls
@@ -9,7 +9,6 @@ INCLUDES = \
-I.. \
-I$(srcdir)/.. \
-I$(srcdir)/../../.. \
- -I$(includedir) \
-I$(top_srcdir)/intl \
-I$(top_srcdir)/camel \
$(CAMEL_CFLAGS) \
diff --git a/camel/providers/smtp/Makefile.am b/camel/providers/smtp/Makefile.am
index b296dd0dee..df26fc0c40 100644
--- a/camel/providers/smtp/Makefile.am
+++ b/camel/providers/smtp/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-libcamelsmtpincludedir = $(includedir)/evolution-$(BASE_VERSION)/camel
+libcamelsmtpincludedir = $(privincludedir)/camel
camel_provider_LTLIBRARIES = libcamelsmtp.la
camel_provider_DATA = libcamelsmtp.urls
@@ -9,7 +9,6 @@ INCLUDES = \
-I.. \
-I$(srcdir)/.. \
-I$(srcdir)/../../.. \
- -I$(includedir) \
-I$(top_srcdir)/intl \
-I$(top_srcdir)/camel \
-I$(top_srcdir)/e-util \