diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 11 |
4 files changed, 14 insertions, 6 deletions
@@ -15,6 +15,7 @@ config.status config.sub configure depcomp +compile install-sh libtool ltmain.sh diff --git a/Makefile.am b/Makefile.am index b4fae9fb..67ce1dc5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,4 +11,4 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-datafiles MAINTAINERCLEANFILES = Makefile.in \ aclocal.m4 configure config.h.in config.sub config.guess \ - ltmain.sh depcomp missing install-sh mkinstalldirs + ltmain.sh depcomp compile missing install-sh mkinstalldirs diff --git a/configure.ac b/configure.ac index 5d560141..6c0116d7 100644 --- a/configure.ac +++ b/configure.ac @@ -11,8 +11,13 @@ AM_MAINTAINER_MODE AC_LANG_C AC_PROG_CC +AM_PROG_CC_C_O AC_PROG_CC_PIE AC_PROG_INSTALL +AC_PROG_SED +AC_PROG_AWK +AM_PROG_MKDIR_P + AC_C_RESTRICT m4_define([_LT_AC_TAGCONFIG], []) @@ -20,6 +25,7 @@ m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])]) AC_DISABLE_STATIC AC_PROG_LIBTOOL +AC_PROG_NM AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization], [disable code optimization through compiler]), [ diff --git a/src/Makefile.am b/src/Makefile.am index 99b01db4..8fe055c0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -36,7 +36,7 @@ plugindir = $(libdir)/ofono/plugins endif AM_CFLAGS = @GTHREAD_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ @GATCHAT_CFLAGS@ \ - @GISI_CFLAGS@ -DPLUGINDIR=\""$(plugindir)"\" + @GISI_CFLAGS@ -DPLUGINDIR=\""$(plugindir)"\" INCLUDES = -I$(top_builddir)/include -I$(top_builddir) @@ -45,9 +45,10 @@ EXTRA_DIST = ofono.conf MAINTAINERCLEANFILES = Makefile.in ofono.exp: $(ofonod_OBJECTS) - $(AM_V_GEN)nm -B *.o | awk '{ print $$3 }' | sort -u | grep -E -e '^ofono_' > $@ + $(AM_V_GEN)$(NM) $^ | $(AWK) '{ print $$3 }' | sort -u | \ + $(EGREP) -e '^ofono_' > $@ ofono.ver: ofono.exp - @echo "{ global:" > $@ - $(AM_V_GEN)cat $< | sed -e "s/\(.*\)/\1;/" >> $@ - @echo "local: *; };" >> $@ + $(AM_V_at)echo "{ global:" > $@ + $(AM_V_GEN)$(SED) -e "s/\(.*\)/\1;/" $< >> $@ + $(AM_V_at)echo "local: *; };" >> $@ |