diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2012-01-22 00:16:23 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2012-01-22 00:16:53 +0300 |
| commit | 0ad6f4dcbec5d8baa38045c3df7315690d727662 (patch) | |
| tree | 2d234c478568c7690495bae9e020edea999c73de | |
| parent | 997b5f610c08e3da38cce4e3adab9839391b9ac7 (diff) | |
| download | util-linux-old-0ad6f4dcbec5d8baa38045c3df7315690d727662.tar.gz | |
Link with gnulib
| -rw-r--r-- | misc-utils/Makefile.am | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am index 3f0843b2..39887027 100644 --- a/misc-utils/Makefile.am +++ b/misc-utils/Makefile.am @@ -22,15 +22,24 @@ dist_man_MANS = cal.1 chkdupexe.1 ddate.1 logger.1 look.1 mcookie.1 \ namei_SOURCES = namei.c $(top_srcdir)/lib/strutils.c +logger_LDADD = $(SOCKET_LIBS) -L$(top_builddir)/gnulib -lgnu +look_LDADD = -L$(top_builddir)/gnulib -lgnu +mcookie_LDADD = -L$(top_builddir)/gnulib -lgnu +namei_LDADD = -L$(top_builddir)/gnulib -lgnu +script_LDADD = -L$(top_builddir)/gnulib -lgnu +scriptreplay_LDADD = -L$(top_builddir)/gnulib -lgnu + if BUILD_LIBUUID usrbin_exec_PROGRAMS += uuidgen dist_man_MANS += uuidgen.1 uuidgen_LDADD = $(ul_libuuid_la) +uuidgen_LDADD += -L$(top_builddir)/gnulib -lgnu uuidgen_CFLAGS = $(AM_CFLAGS) -I$(ul_libuuid_srcdir) if BUILD_UUIDD usrsbin_exec_PROGRAMS += uuidd dist_man_MANS += uuidd.8 uuidd_LDADD = $(ul_libuuid_la) +uuidd_LDADD += -L$(top_builddir)/gnulib -lgnu uuidd_CFLAGS = $(AM_CFLAGS) -I$(ul_libuuid_srcdir) endif endif @@ -83,20 +92,22 @@ endif endif cal_SOURCES = cal.c $(top_srcdir)/lib/mbsalign.c +cal_LDADD = if !HAVE_LANGINFO cal_SOURCES += $(top_srcdir)/lib/langinfo.c endif if HAVE_TINFO -cal_LDADD = -ltinfo @NCURSES_LIBS@ +cal_LDADD += -ltinfo @NCURSES_LIBS@ else if HAVE_NCURSES -cal_LDADD = @NCURSES_LIBS@ +cal_LDADD += @NCURSES_LIBS@ else if HAVE_TERMCAP -cal_LDADD = -ltermcap +cal_LDADD += -ltermcap endif endif endif +cal_LDADD += -L$(top_builddir)/gnulib -lgnu if HAVE_UTIL script_LDADD += -lutil |