+2006-08-02 Bruno Haible <bruno@clisp.org>
+
+ * lang-c: Replace ../lib with ../gnulib-lib.
+ * lang-c++: Likewise.
+ * lang-objc: Likewise.
+
2006-07-30 Bruno Haible <bruno@clisp.org>
* Makefile.am (AM_CPPFLAGS, *_LDADD*): Replace ../lib with
# Put the -I flags before ${CFLAGS} ${CPPFLAGS}, to make sure that libintl.h
# is found in the build directory, regardless of -I options present in
# ${CFLAGS} or ${CPPFLAGS}.
-${LIBTOOL} --quiet --mode=link ${CC} -I.. -I$top_srcdir/lib ../lib/libgettextlib.la -I../intl ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o prog prog.c ${LTLIBINTL} \
+${LIBTOOL} --quiet --mode=link ${CC} -I.. -I$top_srcdir/gnulib-lib ../gnulib-lib/libgettextlib.la -I../intl ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o prog prog.c ${LTLIBINTL} \
|| exit 1
tmpfiles="$tmpfiles prog.pot"
# Put the -I flags before ${CXXFLAGS} ${CPPFLAGS}, to make sure that libintl.h
# is found in the build directory, regardless of -I options present in
# ${CXXFLAGS} or ${CPPFLAGS}.
-${CXX} -I.. -I../../gettext-runtime/libasprintf -I$top_srcdir/lib -I../intl ${CXXFLAGS} ${CPPFLAGS} -c prog.cc \
+${CXX} -I.. -I../../gettext-runtime/libasprintf -I$top_srcdir/gnulib-lib -I../intl ${CXXFLAGS} ${CPPFLAGS} -c prog.cc \
|| exit 1
-${LIBTOOL} --quiet --mode=link ${CXX} ${CXXFLAGS} ${LDFLAGS} -o prog prog.${OBJEXT} ../../gettext-runtime/libasprintf/libasprintf.la ../lib/libgettextlib.la ${LTLIBINTL} \
+${LIBTOOL} --quiet --mode=link ${CXX} ${CXXFLAGS} ${LDFLAGS} -o prog prog.${OBJEXT} ../../gettext-runtime/libasprintf/libasprintf.la ../gnulib-lib/libgettextlib.la ${LTLIBINTL} \
|| exit 1
tmpfiles="$tmpfiles prog.pot"
# Put the -I flags before ${CFLAGS} ${CPPFLAGS}, to make sure that libintl.h
# is found in the build directory, regardless of -I options present in
# ${CFLAGS} or ${CPPFLAGS}.
-${LIBTOOL} --quiet --mode=link ${CC} -I.. -I$top_srcdir/lib ../lib/libgettextlib.la -I../intl ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o prog prog.m ${LTLIBINTL} \
+${LIBTOOL} --quiet --mode=link ${CC} -I.. -I$top_srcdir/gnulib-lib ../gnulib-lib/libgettextlib.la -I../intl ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o prog prog.m ${LTLIBINTL} \
|| exit 1
tmpfiles="$tmpfiles prog.pot"