]>
Commit | Line | Data |
---|---|---|
3dabe3b3 JB |
1 | --- gfs2-utils-3.1.10/gfs2/libgfs2/Makefile.am.orig 2017-03-28 16:08:39.000000000 +0200 |
2 | +++ gfs2-utils-3.1.10/gfs2/libgfs2/Makefile.am 2018-05-16 22:11:05.220787174 +0200 | |
3 | @@ -52,8 +52,7 @@ | |
4 | $(uuid_CFLAGS) | |
5 | ||
6 | gfs2l_SOURCES = gfs2l.c | |
7 | -gfs2l_LDADD = libgfs2.la | |
8 | -gfs2l_LDFLAGS = $(uuid_LIBS) | |
9 | +gfs2l_LDADD = libgfs2.la $(uuid_LIBS) | |
10 | gfs2l_CPPFLAGS = \ | |
11 | -I$(top_srcdir)/gfs2/include \ | |
12 | -D_FILE_OFFSET_BITS=64 | |
13 | --- gfs2-utils-3.1.10/gfs2/convert/Makefile.am.orig 2017-03-28 16:08:39.000000000 +0200 | |
14 | +++ gfs2-utils-3.1.10/gfs2/convert/Makefile.am 2018-05-16 22:14:39.020784730 +0200 | |
15 | @@ -7,5 +7,4 @@ | |
16 | -I$(top_srcdir)/gfs2/include \ | |
17 | -I$(top_srcdir)/gfs2/libgfs2 | |
18 | ||
19 | -gfs2_convert_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la | |
20 | -gfs2_convert_LDFLAGS = $(uuid_LIBS) | |
21 | +gfs2_convert_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la $(uuid_LIBS) | |
22 | --- gfs2-utils-3.1.10/gfs2/fsck/Makefile.am.orig 2017-03-28 16:08:39.000000000 +0200 | |
23 | +++ gfs2-utils-3.1.10/gfs2/fsck/Makefile.am 2018-05-17 05:29:56.060486556 +0200 | |
24 | @@ -36,6 +36,4 @@ | |
25 | -I$(top_srcdir)/gfs2/libgfs2 | |
26 | ||
27 | fsck_gfs2_LDADD = \ | |
28 | - $(top_builddir)/gfs2/libgfs2/libgfs2.la | |
29 | -fsck_gfs2_LDFLAGS = \ | |
30 | - $(uuid_LIBS) | |
31 | + $(top_builddir)/gfs2/libgfs2/libgfs2.la $(uuid_LIBS) | |
32 | --- gfs2-utils-3.1.10/gfs2/mkfs/Makefile.am.orig 2017-03-28 16:08:39.000000000 +0200 | |
33 | +++ gfs2-utils-3.1.10/gfs2/mkfs/Makefile.am 2018-05-17 05:35:10.050482945 +0200 | |
34 | @@ -25,10 +25,7 @@ | |
35 | mkfs_gfs2_CFLAGS = \ | |
36 | $(blkid_CFLAGS) \ | |
37 | $(uuid_CFLAGS) | |
38 | -mkfs_gfs2_LDFLAGS = \ | |
39 | - $(blkid_LIBS) \ | |
40 | - $(uuid_LIBS) | |
41 | -mkfs_gfs2_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la | |
42 | +mkfs_gfs2_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la $(blkid_LIBS) $(uuid_LIBS) | |
43 | ||
44 | gfs2_grow_SOURCES = \ | |
45 | main_grow.c \ | |
46 | @@ -36,16 +33,12 @@ | |
47 | ||
48 | gfs2_grow_CPPFLAGS = $(COMMON_CPPFLAGS) | |
49 | gfs2_grow_CFLAGS = $(blkid_CFLAGS) | |
50 | -gfs2_grow_LDFLAGS = \ | |
51 | - $(blkid_LIBS) \ | |
52 | - $(uuid_LIBS) | |
53 | -gfs2_grow_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la | |
54 | +gfs2_grow_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la $(blkid_LIBS) $(uuid_LIBS) | |
55 | ||
56 | gfs2_jadd_SOURCES = \ | |
57 | main_jadd.c \ | |
58 | metafs.c | |
59 | ||
60 | gfs2_jadd_CPPFLAGS = $(COMMON_CPPFLAGS) | |
61 | -gfs2_jadd_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la | |
62 | -gfs2_jadd_LDFLAGS = $(uuid_LIBS) | |
63 | +gfs2_jadd_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la $(uuid_LIBS) | |
64 | ||
65 | --- gfs2-utils-3.1.10/gfs2/glocktop/Makefile.am.orig 2017-03-28 16:08:39.000000000 +0200 | |
66 | +++ gfs2-utils-3.1.10/gfs2/glocktop/Makefile.am 2018-05-17 05:37:16.380481493 +0200 | |
67 | @@ -9,10 +9,6 @@ | |
68 | glocktop_CFLAGS = \ | |
69 | $(ncurses_CFLAGS) | |
70 | ||
71 | -glocktop_LDFLAGS = \ | |
72 | - $(ncurses_LIBS) \ | |
73 | - $(uuid_LIBS) | |
74 | - | |
75 | glocktop_CPPFLAGS = \ | |
76 | -D_FILE_OFFSET_BITS=64 \ | |
77 | -D_LARGEFILE64_SOURCE \ | |
78 | @@ -21,4 +17,4 @@ | |
79 | -I$(top_srcdir)/gfs2/libgfs2 | |
80 | ||
81 | glocktop_LDADD = \ | |
82 | - $(top_builddir)/gfs2/libgfs2/libgfs2.la | |
83 | + $(top_builddir)/gfs2/libgfs2/libgfs2.la $(ncurses_LIBS) $(uuid_LIBS) | |
84 | --- gfs2-utils-3.1.10/tests/Makefile.am.orig 2017-03-28 16:08:39.000000000 +0200 | |
85 | +++ gfs2-utils-3.1.10/tests/Makefile.am 2018-05-17 05:39:56.260479669 +0200 | |
86 | @@ -22,9 +22,7 @@ | |
87 | -I$(top_srcdir)/gfs2/libgfs2 \ | |
88 | -I$(top_srcdir)/gfs2/include | |
89 | nukerg_LDADD = \ | |
90 | - $(top_builddir)/gfs2/libgfs2/libgfs2.la | |
91 | -nukerg_LDFLAGS = \ | |
92 | - $(uuid_LIBS) | |
93 | + $(top_builddir)/gfs2/libgfs2/libgfs2.la $(uuid_LIBS) | |
94 | ||
95 | if HAVE_CHECK | |
96 | UNIT_TESTS = \ | |
97 | @@ -50,16 +48,14 @@ | |
98 | $(UNIT_SOURCES) \ | |
99 | check_meta.c | |
100 | check_meta_CFLAGS = $(UNIT_CFLAGS) | |
101 | -check_meta_LDADD = $(UNIT_LDADD) | |
102 | -check_meta_LDFLAGS = $(uuid_LIBS) | |
103 | +check_meta_LDADD = $(UNIT_LDADD) $(uuid_LIBS) | |
104 | check_meta_CPPFLAGS = $(UNIT_CPPFLAGS) | |
105 | ||
106 | check_rgrp_SOURCES = \ | |
107 | $(UNIT_SOURCES) \ | |
108 | check_rgrp.c | |
109 | check_rgrp_CFLAGS = $(UNIT_CFLAGS) | |
110 | -check_rgrp_LDADD = $(UNIT_LDADD) | |
111 | -check_rgrp_LDFLAGS = $(uuid_LIBS) | |
112 | +check_rgrp_LDADD = $(UNIT_LDADD) $(uuid_LIBS) | |
113 | check_rgrp_CPPFLAGS = $(UNIT_CPPFLAGS) | |
114 | endif | |
115 |