← Back to branch summary

~pr0gg3d/ubuntu/oneiric/util-linux/bug-805886

« back to all changes in this revision

Viewing changes to Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Scott James Remnant
  • Date: 2009-07-16 15:48:23 UTC
  • mfrom: (1.3.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20090716154823-i26fshvs4v8h90qh
Tags: 2.16-1ubuntu1
https://launchpad.net/bugs/383697
* Merge from Debian, remaining changes:
  - Since udev is required in Ubuntu, the hwclock.sh init script is
    not called on startup and the hwclockfirst.sh init script is
    removed.
  - Remove /etc/adjtime on upgrade if it was not used.
  - Install custom blkid.conf to use /dev/.blkid.tab since we don't
    expect device names to survive a reboot
  - No lsb_release call in mount.preinst since we'd need Pre-Depends
    (LP: #383697).

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile.in
54
54
        $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
55
55
        $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
56
56
        $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
57
 
        $(top_srcdir)/configure.ac
 
57
        $(top_srcdir)/m4/tls.m4 $(top_srcdir)/configure.ac
58
58
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
59
59
        $(ACLOCAL_M4)
60
60
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
76
76
  distclean-recursive maintainer-clean-recursive
77
77
ETAGS = etags
78
78
CTAGS = ctags
79
 
DIST_SUBDIRS = include disk-utils fdisk getopt lib libs login-utils \
 
79
DIST_SUBDIRS = include disk-utils fdisk getopt lib shlibs login-utils \
80
80
        misc-utils po schedutils sys-utils text-utils tests hwclock \
81
81
        partx mount fsck
82
82
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
128
128
LD = @LD@
129
129
LDFLAGS = @LDFLAGS@
130
130
LIBBLKID_VERSION = @LIBBLKID_VERSION@
 
131
LIBBLKID_VERSION_INFO = @LIBBLKID_VERSION_INFO@
131
132
LIBICONV = @LIBICONV@
132
133
LIBINTL = @LIBINTL@
133
134
LIBOBJS = @LIBOBJS@
134
135
LIBS = @LIBS@
135
136
LIBTOOL = @LIBTOOL@
 
137
LIBUUID_VERSION = @LIBUUID_VERSION@
 
138
LIBUUID_VERSION_INFO = @LIBUUID_VERSION_INFO@
136
139
LIPO = @LIPO@
137
140
LN_S = @LN_S@
138
141
LTLIBICONV = @LTLIBICONV@
170
173
SUID_CFLAGS = @SUID_CFLAGS@
171
174
SUID_LDFLAGS = @SUID_LDFLAGS@
172
175
USE_NLS = @USE_NLS@
 
176
UUID_CFLAGS = @UUID_CFLAGS@
 
177
UUID_LIBS = @UUID_LIBS@
173
178
VERSION = @VERSION@
174
179
VOLID = @VOLID@
175
 
VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
176
 
VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
177
 
VOLUME_ID_LIBS_STATIC = @VOLUME_ID_LIBS_STATIC@
178
180
XGETTEXT = @XGETTEXT@
179
181
abs_builddir = @abs_builddir@
180
182
abs_srcdir = @abs_srcdir@
229
231
top_build_prefix = @top_build_prefix@
230
232
top_builddir = @top_builddir@
231
233
top_srcdir = @top_srcdir@
232
 
 
233
 
# The original default vaues of bindir and sbindir:
234
 
usrbinexecdir = ${exec_prefix}/bin
235
 
usrsbinexecdir = ${exec_prefix}/sbin
236
 
usrlibexecdir = ${exec_prefix}/$(libdirname)
 
234
usrbin_execdir = @usrbin_execdir@
 
235
usrlib_execdir = @usrlib_execdir@
 
236
usrsbin_execdir = @usrsbin_execdir@
237
237
AM_CPPFLAGS = -include $(top_builddir)/config.h -I$(top_srcdir)/include \
238
238
        -DLOCALEDIR=\"$(localedir)\"
239
239
 
248
248
 
249
249
# Paths to in-tree libraries (use ul_ prefix to avoid possible collisions)
250
250
#
251
 
ul_libblkid_srcdir = $(top_srcdir)/libs/blkid/src
252
 
ul_libblkid_builddir = $(top_builddir)/libs/blkid/src
253
 
ul_libblkid_la = $(top_builddir)/libs/blkid/src/libblkid.la
254
 
SUBDIRS = include disk-utils fdisk getopt lib libs login-utils \
 
251
# blkid
 
252
ul_libblkid_srcdir = $(top_srcdir)/shlibs/blkid/src
 
253
ul_libblkid_builddir = $(top_builddir)/shlibs/blkid/src
 
254
ul_libblkid_la = $(top_builddir)/shlibs/blkid/src/libblkid.la
 
255
 
 
256
# uuid
 
257
ul_libuuid_srcdir = $(top_srcdir)/shlibs/uuid/src
 
258
ul_libuuid_builddir = $(top_builddir)/shlibs/uuid/src
 
259
ul_libuuid_la = $(top_builddir)/shlibs/uuid/src/libuuid.la
 
260
SUBDIRS = include disk-utils fdisk getopt lib shlibs login-utils \
255
261
        misc-utils po schedutils sys-utils text-utils tests \
256
262
        $(am__append_1) $(am__append_2) $(am__append_3)
257
263
RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o \
733
739
$(ul_libblkid_la):
734
740
        $(MAKE) -C $(ul_libblkid_builddir)
735
741
 
 
742
$(ul_libuuid_la):
 
743
        $(MAKE) -C $(ul_libuuid_builddir)
 
744
 
736
745
distclean-local:
737
746
        -find . -name \*~ -o -name \*.orig -o -name \*.rej | xargs rm -f
738
747
        rm -rf autom4te.cache