summaryrefslogtreecommitdiff
path: root/src/modules/prefs
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/modules/prefs
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/modules/prefs')
-rw-r--r--src/modules/prefs/Makefile.am9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/modules/prefs/Makefile.am b/src/modules/prefs/Makefile.am
index 023ddf4e2..d53f1d2e7 100644
--- a/src/modules/prefs/Makefile.am
+++ b/src/modules/prefs/Makefile.am
@@ -19,8 +19,8 @@ AM_CPPFLAGS = \
19-I$(top_srcdir) \ 19-I$(top_srcdir) \
20-I$(top_srcdir)/src/lib \ 20-I$(top_srcdir)/src/lib \
21-I$(top_builddir)/src/lib \ 21-I$(top_builddir)/src/lib \
22-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 22-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
23-DLOCALE_DIR=\"@LOCALE_DIR@\" \ 23-DLOCALE_DIR=\"$(localedir)\" \
24-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 24-DPACKAGE_LIB_DIR=\"$(libdir)\" \
25@ELEMENTARY_CFLAGS@ \ 25@ELEMENTARY_CFLAGS@ \
26@ELEMENTARY_X_CFLAGS@ \ 26@ELEMENTARY_X_CFLAGS@ \
@@ -30,8 +30,7 @@ AM_CPPFLAGS = \
30@ELEMENTARY_ELOCATION_CFLAGS@ \ 30@ELEMENTARY_ELOCATION_CFLAGS@ \
31@ELEMENTARY_WEB_CFLAGS@ \ 31@ELEMENTARY_WEB_CFLAGS@ \
32@ELEMENTARY_EMAP_CFLAGS@ \ 32@ELEMENTARY_EMAP_CFLAGS@ \
33@ELEMENTARY_WAYLAND_CFLAGS@ \ 33@ELEMENTARY_WAYLAND_CFLAGS@
34@EVIL_CFLAGS@
35 34
36if ELEMENTARY_WINDOWS_BUILD 35if ELEMENTARY_WINDOWS_BUILD
37AM_CPPFLAGS += -DELEMENTARY_BUILD 36AM_CPPFLAGS += -DELEMENTARY_BUILD
@@ -59,7 +58,7 @@ elm_horizontal_box.c \
59elm_vertical_frame.c \ 58elm_vertical_frame.c \
60elm_horizontal_frame.c 59elm_horizontal_frame.c
61 60
62module_la_LIBADD = @ELEMENTARY_LIBS@ $(top_builddir)/src/lib/libelementary.la @EVIL_LIBS@ 61module_la_LIBADD = @ELEMENTARY_LIBS@ $(top_builddir)/src/lib/libelementary.la
63module_la_LDFLAGS = -no-undefined -module -avoid-version 62module_la_LDFLAGS = -no-undefined -module -avoid-version
64module_la_LIBTOOLFLAGS = --tag=disable-static 63module_la_LIBTOOLFLAGS = --tag=disable-static
65 64