summaryrefslogtreecommitdiff
path: root/MCONFIG.in
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2000-01-18 17:53:27 +0000
committerTheodore Ts'o <tytso@mit.edu>2000-01-18 17:53:27 +0000
commit77200f4ed748164179c4e30e85354ed543d25e04 (patch)
treefc3d4854f27879a733b4d5c23c0f8f0ecc10138c /MCONFIG.in
parent3cb7784f307db3f32b008bacbe87fe385f8543a7 (diff)
downloade2fsprogs-77200f4ed748164179c4e30e85354ed543d25e04.tar.gz
ChangeLog, MCONFIG.in:
MCONFIG.in (DEPLIBUUID): Since LIBUUID can sometimes include "-lsocket" we need a separate DEPLIBUUID that can be used in Makefile's dependency rules. ChangeLog, Makefile.in: Makefile.in: Since LIBUUID can sometimes include "-lsocket" we need a separate DEPLIBUUID that can be used in Makefile's dependency rules.
Diffstat (limited to 'MCONFIG.in')
-rw-r--r--MCONFIG.in5
1 files changed, 4 insertions, 1 deletions
diff --git a/MCONFIG.in b/MCONFIG.in
index 8c10d38d..6ce7a5a6 100644
--- a/MCONFIG.in
+++ b/MCONFIG.in
@@ -57,18 +57,21 @@ LIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@
LIBE2P = $(LIB)/libe2p@LIB_EXT@
LIBEXT2FS = $(LIB)/libext2fs@LIB_EXT@
LIBUUID = $(LIB)/libuuid@LIB_EXT@ @SOCKET_LIB@
+DEPLIBUUID = $(LIB)/libuuid@LIB_EXT@
STATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@
STATIC_LIBCOM_ERR = $(LIB)/libcom_err@STATIC_LIB_EXT@
STATIC_LIBE2P = $(LIB)/libe2p@STATIC_LIB_EXT@
STATIC_LIBEXT2FS = $(LIB)/libext2fs@STATIC_LIB_EXT@
STATIC_LIBUUID = $(LIB)/libuuid@STATIC_LIB_EXT@ @SOCKET_LIB@
+DEPSTATIC_LIBUUID = $(LIB)/libuuid@STATIC_LIB_EXT@
PROFILED_LIBSS = $(LIB)/libss@PROFILED_LIB_EXT@
PROFILED_LIBCOM_ERR = $(LIB)/libcom_err@PROFILED_LIB_EXT@
PROFILED_LIBE2P = $(LIB)/libe2p@PROFILED_LIB_EXT@
PROFILED_LIBEXT2FS = $(LIB)/libext2fs@PROFILED_LIB_EXT@
PROFILED_LIBUUID = $(LIB)/libuuid@PROFILED_LIB_EXT@ @SOCKET_LIB@
+DEPPROFILED_LIBUUID = $(LIB)/libuuid@PROFILED_LIB_EXT@
#
# Use these definitions is you use tools 2.x, x < 16
@@ -94,7 +97,7 @@ SUBSTITUTE= $(top_builddir)/util/subst -f $(SUBST_CONF)
DEP_SUBSTITUTE= $(top_builddir)/util/subst $(SUBST_CONF)
$(top_builddir)/util/subst:
- $(MAKE) -C $(top_builddir)/util subst
+ (cd $(top_builddir)/util ; $(MAKE) subst)
#
# Warning flags