summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorVincent Torri <vincent dot torri at gmail dot com>2014-08-29 19:05:30 +0200
committerTom Hacohen <tom@stosb.com>2014-09-02 10:29:50 +0100
commit2a1bc688a94583af71ce44a3db0b1d403590b23d (patch)
tree7f9a9de26698fe69e300f62e1038aa194d857942 /src/lib
parentc707a638d365f401d0f1063fa8eb738d35c44089 (diff)
Reorganise configure.ac layout (and simplify)
This includes: Bumping versions of autoconf and automake. Remove or replace deprecated macros. Use correct paths.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/Makefile.am11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 337e14c7c..4b4ca848b 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -18,10 +18,10 @@ AM_CPPFLAGS = \
18-I$(top_srcdir)/src/imported \ 18-I$(top_srcdir)/src/imported \
19-I$(top_srcdir)/src/lib \ 19-I$(top_srcdir)/src/lib \
20-I$(top_builddir)/src/lib \ 20-I$(top_builddir)/src/lib \
21-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 21-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
22-DLOCALE_DIR=\"@LOCALE_DIR@\" \ 22-DLOCALE_DIR=\"$(localedir)\" \
23-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 23-DPACKAGE_LIB_DIR=\"$(libdir)\" \
24-DICON_DIR=\"$(elementary_icon_dir)\" \ 24-DICON_DIR=\"$(datadir)/icons\" \
25@ELEMENTARY_CFLAGS@ \ 25@ELEMENTARY_CFLAGS@ \
26@ELEMENTARY_X_CFLAGS@ \ 26@ELEMENTARY_X_CFLAGS@ \
27@ELEMENTARY_FB_CFLAGS@ \ 27@ELEMENTARY_FB_CFLAGS@ \
@@ -32,8 +32,7 @@ AM_CPPFLAGS = \
32@ELEMENTARY_WEB_CFLAGS@ \ 32@ELEMENTARY_WEB_CFLAGS@ \
33@ELEMENTARY_EMAP_CFLAGS@ \ 33@ELEMENTARY_EMAP_CFLAGS@ \
34@ELEMENTARY_WAYLAND_CFLAGS@ \ 34@ELEMENTARY_WAYLAND_CFLAGS@ \
35@ELEMENTARY_DRM_CFLAGS@ \ 35@ELEMENTARY_DRM_CFLAGS@
36@EVIL_CFLAGS@
37 36
38if ELEMENTARY_WINDOWS_BUILD 37if ELEMENTARY_WINDOWS_BUILD
39AM_CPPFLAGS += -DELEMENTARY_BUILD 38AM_CPPFLAGS += -DELEMENTARY_BUILD
@@ -514,7 +513,6 @@ elu_ews_wm.c
514libelementary_la_CFLAGS = 513libelementary_la_CFLAGS =
515libelementary_la_LIBADD = \ 514libelementary_la_LIBADD = \
516@my_libs@ \ 515@my_libs@ \
517@dlopen_libs@ \
518@ELEMENTARY_LIBS@ \ 516@ELEMENTARY_LIBS@ \
519@ELEMENTARY_X_LIBS@ \ 517@ELEMENTARY_X_LIBS@ \
520@ELEMENTARY_FB_LIBS@ \ 518@ELEMENTARY_FB_LIBS@ \
@@ -525,7 +523,6 @@ libelementary_la_LIBADD = \
525@ELEMENTARY_EMAP_LIBS@ \ 523@ELEMENTARY_EMAP_LIBS@ \
526@ELEMENTARY_WAYLAND_LIBS@ \ 524@ELEMENTARY_WAYLAND_LIBS@ \
527@ELEMENTARY_DRM_LIBS@ \ 525@ELEMENTARY_DRM_LIBS@ \
528@EVIL_LIBS@ \
529@LTLIBINTL@ 526@LTLIBINTL@
530 527
531libelementary_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 528libelementary_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@