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

« back to all changes in this revision

Viewing changes to mount/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
* 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:
43
43
@HAVE_STATIC_MOUNT_TRUE@am__append_2 = $(ldadd_static)
44
44
@HAVE_STATIC_UMOUNT_TRUE@am__append_3 = umount.static
45
45
@HAVE_STATIC_LOSETUP_TRUE@am__append_4 = losetup.static
46
 
@BUILD_LIBBLKID_TRUE@@HAVE_BLKID_TRUE@am__append_5 = $(ul_libblkid_la)
47
 
@BUILD_LIBBLKID_TRUE@@HAVE_BLKID_TRUE@am__append_6 = $(ul_libblkid_la)
48
 
@BUILD_LIBBLKID_TRUE@@HAVE_BLKID_TRUE@am__append_7 = -I$(ul_libblkid_srcdir)
49
 
@BUILD_LIBBLKID_FALSE@@HAVE_BLKID_TRUE@am__append_8 = $(BLKID_LIBS)
50
 
@BUILD_LIBBLKID_FALSE@@HAVE_BLKID_TRUE@am__append_9 = $(BLKID_LIBS_STATIC)
51
 
@BUILD_LIBBLKID_FALSE@@HAVE_BLKID_TRUE@am__append_10 = $(BLKID_CFLAGS)
52
 
@HAVE_VOLUME_ID_TRUE@am__append_11 = $(VOLUME_ID_LIBS)
53
 
@HAVE_VOLUME_ID_TRUE@am__append_12 = $(VOLUME_ID_LIBS_STATIC)
54
 
@HAVE_VOLUME_ID_TRUE@am__append_13 = $(VOLUME_ID_CFLAGS)
55
 
@HAVE_SELINUX_TRUE@am__append_14 = $(SELINUX_LIBS)
56
 
@HAVE_SELINUX_TRUE@am__append_15 = $(SELINUX_LIBS_STATIC)
 
46
@BUILD_LIBBLKID_TRUE@am__append_5 = $(ul_libblkid_la)
 
47
@BUILD_LIBBLKID_TRUE@am__append_6 = $(ul_libblkid_la)
 
48
@BUILD_LIBBLKID_TRUE@am__append_7 = -I$(ul_libblkid_srcdir)
 
49
@BUILD_LIBBLKID_FALSE@am__append_8 = $(BLKID_LIBS)
 
50
@BUILD_LIBBLKID_FALSE@am__append_9 = $(BLKID_LIBS_STATIC)
 
51
@BUILD_LIBBLKID_FALSE@am__append_10 = $(BLKID_CFLAGS)
 
52
@HAVE_SELINUX_TRUE@am__append_11 = $(SELINUX_LIBS)
 
53
@HAVE_SELINUX_TRUE@am__append_12 = $(SELINUX_LIBS_STATIC)
57
54
noinst_PROGRAMS = mtab_lock_test$(EXEEXT)
58
55
subdir = mount
59
56
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
64
61
        $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
65
62
        $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
66
63
        $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
67
 
        $(top_srcdir)/configure.ac
 
64
        $(top_srcdir)/m4/tls.m4 $(top_srcdir)/configure.ac
68
65
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
69
66
        $(ACLOCAL_M4)
70
67
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
110
107
        mount-setproctitle.$(OBJEXT)
111
108
mount_OBJECTS = $(am_mount_OBJECTS)
112
109
am__DEPENDENCIES_1 =
113
 
@BUILD_LIBBLKID_FALSE@@HAVE_BLKID_TRUE@am__DEPENDENCIES_2 =  \
114
 
@BUILD_LIBBLKID_FALSE@@HAVE_BLKID_TRUE@ $(am__DEPENDENCIES_1)
115
 
@HAVE_VOLUME_ID_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
116
 
am__DEPENDENCIES_4 = $(am__append_5) $(am__DEPENDENCIES_2) \
117
 
        $(am__DEPENDENCIES_3)
118
 
@HAVE_SELINUX_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1)
119
 
mount_DEPENDENCIES = $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
 
110
@BUILD_LIBBLKID_FALSE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
 
111
am__DEPENDENCIES_3 = $(am__append_5) $(am__DEPENDENCIES_2)
 
112
@HAVE_SELINUX_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
 
113
mount_DEPENDENCIES = $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_4)
120
114
mount_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
121
115
        --mode=link $(CCLD) $(mount_CFLAGS) $(CFLAGS) $(mount_LDFLAGS) \
122
116
        $(LDFLAGS) -o $@
141
135
        mount_static-setproctitle.$(OBJEXT)
142
136
@HAVE_STATIC_MOUNT_TRUE@am_mount_static_OBJECTS = $(am__objects_9)
143
137
mount_static_OBJECTS = $(am_mount_static_OBJECTS)
144
 
am__DEPENDENCIES_6 = $(am__append_6) $(am__DEPENDENCIES_2) \
145
 
        $(am__DEPENDENCIES_3)
146
 
@HAVE_STATIC_MOUNT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_6)
147
 
mount_static_DEPENDENCIES = $(am__DEPENDENCIES_7) \
148
 
        $(am__DEPENDENCIES_5)
 
138
am__DEPENDENCIES_5 = $(am__append_6) $(am__DEPENDENCIES_2)
 
139
@HAVE_STATIC_MOUNT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_5)
 
140
mount_static_DEPENDENCIES = $(am__DEPENDENCIES_6) \
 
141
        $(am__DEPENDENCIES_4)
149
142
mount_static_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
150
143
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(mount_static_CFLAGS) \
151
144
        $(CFLAGS) $(mount_static_LDFLAGS) $(LDFLAGS) -o $@
161
154
        swapon-linux_version.$(OBJEXT) swapon-blkdev.$(OBJEXT) \
162
155
        swapon-fsprobe.$(OBJEXT) swapon-canonicalize.$(OBJEXT)
163
156
swapon_OBJECTS = $(am_swapon_OBJECTS)
164
 
swapon_DEPENDENCIES = $(am__DEPENDENCIES_4)
 
157
swapon_DEPENDENCIES = $(am__DEPENDENCIES_3)
165
158
swapon_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
166
159
        --mode=link $(CCLD) $(swapon_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
167
160
        $(LDFLAGS) -o $@
174
167
        umount-blkdev.$(OBJEXT) umount-fsprobe.$(OBJEXT)
175
168
am_umount_OBJECTS = umount-umount.$(OBJEXT) $(am__objects_12)
176
169
umount_OBJECTS = $(am_umount_OBJECTS)
177
 
umount_DEPENDENCIES = $(am__DEPENDENCIES_4)
 
170
umount_DEPENDENCIES = $(am__DEPENDENCIES_3)
178
171
umount_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
179
172
        --mode=link $(CCLD) $(umount_CFLAGS) $(CFLAGS) \
180
173
        $(umount_LDFLAGS) $(LDFLAGS) -o $@
200
193
@HAVE_STATIC_UMOUNT_TRUE@am_umount_static_OBJECTS = $(am__objects_15)
201
194
umount_static_OBJECTS = $(am_umount_static_OBJECTS)
202
195
@HAVE_STATIC_UMOUNT_TRUE@umount_static_DEPENDENCIES =  \
203
 
@HAVE_STATIC_UMOUNT_TRUE@       $(am__DEPENDENCIES_6)
 
196
@HAVE_STATIC_UMOUNT_TRUE@       $(am__DEPENDENCIES_5)
204
197
umount_static_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
205
198
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(umount_static_CFLAGS) \
206
199
        $(CFLAGS) $(umount_static_LDFLAGS) $(LDFLAGS) -o $@
270
263
LD = @LD@
271
264
LDFLAGS = @LDFLAGS@
272
265
LIBBLKID_VERSION = @LIBBLKID_VERSION@
 
266
LIBBLKID_VERSION_INFO = @LIBBLKID_VERSION_INFO@
273
267
LIBICONV = @LIBICONV@
274
268
LIBINTL = @LIBINTL@
275
269
LIBOBJS = @LIBOBJS@
276
270
LIBS = @LIBS@
277
271
LIBTOOL = @LIBTOOL@
 
272
LIBUUID_VERSION = @LIBUUID_VERSION@
 
273
LIBUUID_VERSION_INFO = @LIBUUID_VERSION_INFO@
278
274
LIPO = @LIPO@
279
275
LN_S = @LN_S@
280
276
LTLIBICONV = @LTLIBICONV@
312
308
SUID_CFLAGS = @SUID_CFLAGS@
313
309
SUID_LDFLAGS = @SUID_LDFLAGS@
314
310
USE_NLS = @USE_NLS@
 
311
UUID_CFLAGS = @UUID_CFLAGS@
 
312
UUID_LIBS = @UUID_LIBS@
315
313
VERSION = @VERSION@
316
314
VOLID = @VOLID@
317
 
VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
318
 
VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
319
 
VOLUME_ID_LIBS_STATIC = @VOLUME_ID_LIBS_STATIC@
320
315
XGETTEXT = @XGETTEXT@
321
316
abs_builddir = @abs_builddir@
322
317
abs_srcdir = @abs_srcdir@
371
366
top_build_prefix = @top_build_prefix@
372
367
top_builddir = @top_builddir@
373
368
top_srcdir = @top_srcdir@
374
 
 
375
 
# The original default vaues of bindir and sbindir:
376
 
usrbinexecdir = ${exec_prefix}/bin
377
 
usrsbinexecdir = ${exec_prefix}/sbin
378
 
usrlibexecdir = ${exec_prefix}/$(libdirname)
 
369
usrbin_execdir = @usrbin_execdir@
 
370
usrlib_execdir = @usrlib_execdir@
 
371
usrsbin_execdir = @usrsbin_execdir@
379
372
AM_CPPFLAGS = -include $(top_builddir)/config.h -I$(top_srcdir)/include \
380
373
        -DLOCALEDIR=\"$(localedir)\"
381
374
 
390
383
 
391
384
# Paths to in-tree libraries (use ul_ prefix to avoid possible collisions)
392
385
#
393
 
ul_libblkid_srcdir = $(top_srcdir)/libs/blkid/src
394
 
ul_libblkid_builddir = $(top_builddir)/libs/blkid/src
395
 
ul_libblkid_la = $(top_builddir)/libs/blkid/src/libblkid.la
 
386
# blkid
 
387
ul_libblkid_srcdir = $(top_srcdir)/shlibs/blkid/src
 
388
ul_libblkid_builddir = $(top_builddir)/shlibs/blkid/src
 
389
ul_libblkid_la = $(top_builddir)/shlibs/blkid/src/libblkid.la
 
390
 
 
391
# uuid
 
392
ul_libuuid_srcdir = $(top_srcdir)/shlibs/uuid/src
 
393
ul_libuuid_builddir = $(top_builddir)/shlibs/uuid/src
 
394
ul_libuuid_la = $(top_builddir)/shlibs/uuid/src/libuuid.la
396
395
EXTRA_DIST = README.mount
397
396
dist_man_MANS = fstab.5 mount.8 swapoff.8 swapon.8 umount.8 losetup.8
398
397
 
413
412
# generic flags for all programs (except losetup)
414
413
# -- note that pkg-config autoconf macros (pkg.m4) does not differentiate
415
414
#    between CFLAGS and CPPFLAGS, we follow this behaviour and use CFLAGS only.
416
 
ldadd_common = $(am__append_5) $(am__append_8) $(am__append_11)
417
 
ldadd_static = $(am__append_6) $(am__append_9) $(am__append_12)
418
 
cflags_common = $(am__append_7) $(am__append_10) $(am__append_13)
 
415
ldadd_common = $(am__append_5) $(am__append_8)
 
416
ldadd_static = $(am__append_6) $(am__append_9)
 
417
cflags_common = $(am__append_7) $(am__append_10)
419
418
 
420
419
# generic libtool options for all static programs
421
420
ldflags_static = "-all-static"
422
421
mount_SOURCES = mount.c $(srcs_mount) ../lib/setproctitle.c
423
422
mount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) $(cflags_common)
424
423
mount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
425
 
mount_LDADD = $(ldadd_common) $(am__append_14)
 
424
mount_LDADD = $(ldadd_common) $(am__append_11)
426
425
umount_SOURCES = umount.c $(srcs_mount)
427
426
umount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) $(cflags_common)
428
427
umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
434
433
swapon_LDADD = $(ldadd_common)
435
434
losetup_SOURCES = lomount.c $(srcs_common) loop.h lomount.h
436
435
losetup_CPPFLAGS = -DMAIN $(AM_CPPFLAGS)
437
 
mount_static_LDADD = $(am__append_2) $(am__append_15)
 
436
mount_static_LDADD = $(am__append_2) $(am__append_12)
438
437
@HAVE_STATIC_MOUNT_TRUE@mount_static_SOURCES = $(mount_SOURCES)
439
438
@HAVE_STATIC_MOUNT_TRUE@mount_static_CFLAGS = $(cflags_common)
440
439
@HAVE_STATIC_MOUNT_TRUE@mount_static_LDFLAGS = $(ldflags_static)
2053
2052
$(ul_libblkid_la):
2054
2053
        $(MAKE) -C $(ul_libblkid_builddir)
2055
2054
 
 
2055
$(ul_libuuid_la):
 
2056
        $(MAKE) -C $(ul_libuuid_builddir)
 
2057
 
2056
2058
install-exec-hook:
2057
2059
        chmod 4755 $(DESTDIR)$(bindir)/mount
2058
2060
        chmod 4755 $(DESTDIR)$(bindir)/umount