?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
updated on Tue Jan 10 12:02:00 UTC 2012
[aur-mirror.git] / parted-git / gnu-parted_fix_non-srcdir_build.patch
blobcd50d8f0eea29e87ce3a74f627b7ae50d1e21df5
1 From bd12c2a0dda8e367a917e23a0ceec48893dd381d Mon Sep 17 00:00:00 2001
2 From: Keshav P R <the.ridikulus.rat@gmail.com>
3 Date: Tue, 10 Jan 2012 15:19:54 +0530
4 Subject: [PATCH] Add -I$(top_builddir)/include to partedincludedir in all
5 Makefile.am to fix non-srcdir build
6
7 ---
8 libparted/Makefile.am | 2 +-
9 libparted/fs/Makefile.am | 2 +-
10 libparted/fs/amiga/Makefile.am | 2 +-
11 libparted/fs/ext2/Makefile.am | 2 +-
12 libparted/fs/fat/Makefile.am | 2 +-
13 libparted/fs/hfs/Makefile.am | 2 +-
14 libparted/fs/jfs/Makefile.am | 2 +-
15 libparted/fs/linux_swap/Makefile.am | 2 +-
16 libparted/fs/nilfs2/Makefile.am | 2 +-
17 libparted/fs/ntfs/Makefile.am | 2 +-
18 libparted/fs/reiserfs/Makefile.am | 2 +-
19 libparted/fs/ufs/Makefile.am | 2 +-
20 libparted/fs/xfs/Makefile.am | 2 +-
21 libparted/labels/Makefile.am | 2 +-
22 libparted/tests/Makefile.am | 4 ++--
23 parted/Makefile.am | 2 +-
24 partprobe/Makefile.am | 2 +-
25 tests/Makefile.am | 4 ++--
26 18 files changed, 20 insertions(+), 20 deletions(-)
27
28 diff --git a/libparted/Makefile.am b/libparted/Makefile.am
29 index 4bc1939..85b70ae 100644
30 --- a/libparted/Makefile.am
31 +++ b/libparted/Makefile.am
32 @@ -18,7 +18,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
33 SUBDIRS = labels fs . $(SUBDIRS_CHECK)
34
35
36 -partedincludedir = -I$(top_srcdir)/lib -I$(top_srcdir)/include
37 +partedincludedir = -I$(top_srcdir)/lib -I$(top_builddir)/lib -I$(top_srcdir)/include -I$(top_builddir)/include
38 lib_LTLIBRARIES = libparted.la
39
40 # Set the shared library version, per Libtool's guidelines.
41 diff --git a/libparted/fs/Makefile.am b/libparted/fs/Makefile.am
42 index cb09ffb..e728c3b 100644
43 --- a/libparted/fs/Makefile.am
44 +++ b/libparted/fs/Makefile.am
45 @@ -6,7 +6,7 @@
46 SUBDIRS = amiga ext2 ufs fat ntfs hfs linux_swap xfs jfs reiserfs \
47 nilfs2 # bfs
48
49 -partedincludedir = -I$(top_srcdir)/include
50 +partedincludedir = -I$(top_srcdir)/include -I$(top_builddir)/include
51 noinst_LTLIBRARIES = libfs.la
52 libfs_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
53 -release $(LT_RELEASE)
54 diff --git a/libparted/fs/amiga/Makefile.am b/libparted/fs/amiga/Makefile.am
55 index 788ecac..a9ec421 100644
56 --- a/libparted/fs/amiga/Makefile.am
57 +++ b/libparted/fs/amiga/Makefile.am
58 @@ -1,5 +1,5 @@
59 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
60 -partedincludedir = -I$(top_srcdir)/include
61 +partedincludedir = -I$(top_srcdir)/include -I$(top_builddir)/include
62
63 noinst_LTLIBRARIES = libamigafs.la
64 libamigafs_la_SOURCES = amiga.h \
65 diff --git a/libparted/fs/ext2/Makefile.am b/libparted/fs/ext2/Makefile.am
66 index 0acd080..15eac2a 100644
67 --- a/libparted/fs/ext2/Makefile.am
68 +++ b/libparted/fs/ext2/Makefile.am
69 @@ -1,5 +1,5 @@
70 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
71 -partedincludedir = -I$(top_srcdir)/include
72 +partedincludedir = -I$(top_srcdir)/include -I$(top_builddir)/include
73
74 noinst_LTLIBRARIES = libext2.la
75 libext2_la_SOURCES = ext2.h \
76 diff --git a/libparted/fs/fat/Makefile.am b/libparted/fs/fat/Makefile.am
77 index 9c975d7..41fb8de 100644
78 --- a/libparted/fs/fat/Makefile.am
79 +++ b/libparted/fs/fat/Makefile.am
80 @@ -1,4 +1,4 @@
81 -partedincludedir = -I$(top_srcdir)/include
82 +partedincludedir = -I$(top_srcdir)/include -I$(top_builddir)/include
83
84 noinst_LTLIBRARIES = libfat.la
85 libfat_la_SOURCES = bootsector.c \
86 diff --git a/libparted/fs/hfs/Makefile.am b/libparted/fs/hfs/Makefile.am
87 index f85493c..5691912 100644
88 --- a/libparted/fs/hfs/Makefile.am
89 +++ b/libparted/fs/hfs/Makefile.am
90 @@ -1,5 +1,5 @@
91 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
92 -partedincludedir = -I$(top_srcdir)/include
93 +partedincludedir = -I$(top_srcdir)/include -I$(top_builddir)/include
94
95 noinst_LTLIBRARIES = libhfs.la
96 libhfs_la_SOURCES = hfs.c hfs.h \
97 diff --git a/libparted/fs/jfs/Makefile.am b/libparted/fs/jfs/Makefile.am
98 index a477874..f55b60d 100644
99 --- a/libparted/fs/jfs/Makefile.am
100 +++ b/libparted/fs/jfs/Makefile.am
101 @@ -1,5 +1,5 @@
102 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
103 -partedincludedir = -I$(top_srcdir)/include
104 +partedincludedir = -I$(top_srcdir)/include -I$(top_builddir)/include
105
106 noinst_LTLIBRARIES = libjfs.la
107 libjfs_la_SOURCES = jfs.c jfs_superblock.h jfs_types.h
108 diff --git a/libparted/fs/linux_swap/Makefile.am b/libparted/fs/linux_swap/Makefile.am
109 index a366fc6..4a9260a 100644
110 --- a/libparted/fs/linux_swap/Makefile.am
111 +++ b/libparted/fs/linux_swap/Makefile.am
112 @@ -1,4 +1,4 @@
113 -partedincludedir = -I$(top_srcdir)/include
114 +partedincludedir = -I$(top_srcdir)/include -I$(top_builddir)/include
115
116 noinst_LTLIBRARIES = liblinuxswap.la
117 liblinuxswap_la_SOURCES = linux_swap.c
118 diff --git a/libparted/fs/nilfs2/Makefile.am b/libparted/fs/nilfs2/Makefile.am
119 index c7cfd68..4c2ed84 100644
120 --- a/libparted/fs/nilfs2/Makefile.am
121 +++ b/libparted/fs/nilfs2/Makefile.am
122 @@ -1,4 +1,4 @@
123 -partedincludedir = -I$(top_srcdir)/include
124 +partedincludedir = -I$(top_srcdir)/include -I$(top_builddir)/include
125
126 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
127
128 diff --git a/libparted/fs/ntfs/Makefile.am b/libparted/fs/ntfs/Makefile.am
129 index 732692a..d9a370c 100644
130 --- a/libparted/fs/ntfs/Makefile.am
131 +++ b/libparted/fs/ntfs/Makefile.am
132 @@ -1,5 +1,5 @@
133 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
134 -partedincludedir = -I$(top_srcdir)/include
135 +partedincludedir = -I$(top_srcdir)/include -I$(top_builddir)/include
136
137 noinst_LTLIBRARIES = libntfs.la
138 libntfs_la_SOURCES = ntfs.c
139 diff --git a/libparted/fs/reiserfs/Makefile.am b/libparted/fs/reiserfs/Makefile.am
140 index 7df005a..16cebe0 100644
141 --- a/libparted/fs/reiserfs/Makefile.am
142 +++ b/libparted/fs/reiserfs/Makefile.am
143 @@ -1,5 +1,5 @@
144 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
145 -partedincludedir = -I$(top_srcdir)/include
146 +partedincludedir = -I$(top_srcdir)/include -I$(top_builddir)/include
147
148 noinst_LTLIBRARIES = libreiserfs.la
149
150 diff --git a/libparted/fs/ufs/Makefile.am b/libparted/fs/ufs/Makefile.am
151 index c63e8d2..895fa55 100644
152 --- a/libparted/fs/ufs/Makefile.am
153 +++ b/libparted/fs/ufs/Makefile.am
154 @@ -1,5 +1,5 @@
155 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
156 -partedincludedir = -I$(top_srcdir)/include
157 +partedincludedir = -I$(top_srcdir)/include -I$(top_builddir)/include
158
159 noinst_LTLIBRARIES = libufs.la
160 libufs_la_SOURCES = ufs.c
161 diff --git a/libparted/fs/xfs/Makefile.am b/libparted/fs/xfs/Makefile.am
162 index 8e55052..7c7ed7f 100644
163 --- a/libparted/fs/xfs/Makefile.am
164 +++ b/libparted/fs/xfs/Makefile.am
165 @@ -1,5 +1,5 @@
166 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
167 -partedincludedir = -I$(top_srcdir)/include
168 +partedincludedir = -I$(top_srcdir)/include -I$(top_builddir)/include
169
170 noinst_LTLIBRARIES = libxfs.la
171 libxfs_la_SOURCES = xfs.c xfs_sb.h xfs_types.h platform_defs.h
172 diff --git a/libparted/labels/Makefile.am b/libparted/labels/Makefile.am
173 index 967e537..62877b7 100644
174 --- a/libparted/labels/Makefile.am
175 +++ b/libparted/labels/Makefile.am
176 @@ -12,7 +12,7 @@ endif
177 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
178
179 partedincludedir = \
180 - -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir)/libparted
181 + -I$(top_srcdir)/lib -I$(top_builddir)/lib -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir)/libparted
182 noinst_LTLIBRARIES = liblabels.la
183
184 liblabels_la_SOURCES = \
185 diff --git a/libparted/tests/Makefile.am b/libparted/tests/Makefile.am
186 index de8d03e..6453c07 100644
187 --- a/libparted/tests/Makefile.am
188 +++ b/libparted/tests/Makefile.am
189 @@ -14,8 +14,8 @@ LDADD = \
190
191 AM_CPPFLAGS = \
192 $(CHECK_CFLAGS) \
193 - -I$(top_srcdir)/lib \
194 - -I$(top_srcdir)/include
195 + -I$(top_srcdir)/lib -I$(top_builddir)/lib \
196 + -I$(top_srcdir)/include -I$(top_builddir)/include
197
198 label_SOURCES = common.h common.c label.c
199 disk_SOURCES = common.h common.c disk.c
200 diff --git a/parted/Makefile.am b/parted/Makefile.am
201 index 7b093c6..55be5ae 100644
202 --- a/parted/Makefile.am
203 +++ b/parted/Makefile.am
204 @@ -3,7 +3,7 @@ BUILT_SOURCES =
205 sbin_PROGRAMS = parted
206
207 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
208 -partedincludedir = -I$(top_srcdir)/lib -I$(top_srcdir)/include
209 +partedincludedir = -I$(top_srcdir)/lib -I$(top_builddir)/lib -I$(top_srcdir)/include -I$(top_builddir)/include
210
211 parted_SOURCES = command.c \
212 command.h \
213 diff --git a/partprobe/Makefile.am b/partprobe/Makefile.am
214 index f140991..90d8856 100644
215 --- a/partprobe/Makefile.am
216 +++ b/partprobe/Makefile.am
217 @@ -1,4 +1,4 @@
218 -partedincludedir = -I$(top_srcdir)/lib -I$(top_srcdir)/include
219 +partedincludedir = -I$(top_srcdir)/lib -I$(top_builddir)/lib -I$(top_srcdir)/include -I$(top_builddir)/include
220
221 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
222 sbin_PROGRAMS = partprobe
223 diff --git a/tests/Makefile.am b/tests/Makefile.am
224 index f442204..4544bda 100644
225 --- a/tests/Makefile.am
226 +++ b/tests/Makefile.am
227 @@ -73,8 +73,8 @@ check_PROGRAMS = print-align print-max dup-clobber duplicate
228 LDADD = \
229 $(top_builddir)/libparted/libparted.la
230 AM_CPPFLAGS = \
231 - -I$(top_srcdir)/lib \
232 - -I$(top_srcdir)/include
233 + -I$(top_srcdir)/lib -I$(top_builddir)/lib \
234 + -I$(top_srcdir)/include -I$(top_builddir)/include
235 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
236
237 parted_dir = $(abs_top_builddir)/parted
238 --
239 1.7.8.3
240
AUR mirror