Skip to content

L
libzmq
Commit c6aedc38 authored by Phillip Mienk's avatar Phillip Mienk
Browse files
Options

Partial migration to nonrecursive make.

parent 3aa5a9d4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 5 deletions
Makefile.am
View file @ c6aedc38
This diff is collapsed.
configure.ac
View file @ c6aedc38
...@@ -11,7 +11,7 @@ AC_INIT([zeromq],[m4_esyscmd([./version.sh])],[zeromq-dev@lists.zeromq.org]) ...@@ -11,7 +11,7 @@ AC_INIT([zeromq],[m4_esyscmd([./version.sh])],[zeromq-dev@lists.zeromq.org])
AC_CONFIG_AUX_DIR(config) AC_CONFIG_AUX_DIR(config)
AC_CONFIG_MACRO_DIR(config) AC_CONFIG_MACRO_DIR(config)
AC_CONFIG_HEADERS([src/platform.hpp]) AC_CONFIG_HEADERS([src/platform.hpp])
AM_INIT_AUTOMAKE(tar-ustar dist-zip foreign) AM_INIT_AUTOMAKE(subdir-objects tar-ustar dist-zip foreign)
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
# This lets us use PACKAGE_VERSION in Makefiles # This lets us use PACKAGE_VERSION in Makefiles
...@@ -562,13 +562,14 @@ AC_SUBST(LIBZMQ_EXTRA_CFLAGS) ...@@ -562,13 +562,14 @@ AC_SUBST(LIBZMQ_EXTRA_CFLAGS)
AC_SUBST(LIBZMQ_EXTRA_CXXFLAGS) AC_SUBST(LIBZMQ_EXTRA_CXXFLAGS)
AC_SUBST(LIBZMQ_EXTRA_LDFLAGS) AC_SUBST(LIBZMQ_EXTRA_LDFLAGS)
AC_ARG_WITH([pkgconfigdir], AS_HELP_STRING([--with-pkgconfigdir=PATH],
[Path to the pkgconfig directory [[LIBDIR/pkgconfig]]]),
[pkgconfigdir="$withval"], [pkgconfigdir='${libdir}/pkgconfig'])
AC_SUBST([pkgconfigdir])
AC_CONFIG_FILES([Makefile \ AC_CONFIG_FILES([Makefile \
src/Makefile \
src/libzmq.pc \ src/libzmq.pc \
doc/Makefile \ doc/Makefile \
perf/Makefile \
tests/Makefile \
tools/Makefile \
builds/msvc/Makefile \ builds/msvc/Makefile \
foreign/openpgm/Makefile \ foreign/openpgm/Makefile \
builds/redhat/zeromq.spec]) builds/redhat/zeromq.spec])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment