git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
let the user explicitly choose ruby and rake programs
[libguestfs.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
32ac7df
..
28a1b92
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-13,7
+13,7
@@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc.,
675 Mass Ave, Cambridge, MA 02139,
USA.
+# Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA.
include $(top_srcdir)/subdir-rules.mk
include $(top_srcdir)/subdir-rules.mk
@@
-113,7
+113,7
@@
errnostring_gperf.c: errnostring_gperf.gperf
# 'libguestfs.so.0.$(MAX_PROC_NR).0'.
libguestfs_la_LDFLAGS = -version-info $(MAX_PROC_NR):0:$(MAX_PROC_NR)
# 'libguestfs.so.0.$(MAX_PROC_NR).0'.
libguestfs_la_LDFLAGS = -version-info $(MAX_PROC_NR):0:$(MAX_PROC_NR)
-libguestfs_la_LDFLAGS += $(VERSION_SCRIPT_FLAGS)libguestfs.syms
+libguestfs_la_LDFLAGS += $(VERSION_SCRIPT_FLAGS)
$(srcdir)/
libguestfs.syms
libguestfs_la_SOURCES = \
guestfs.c \
libguestfs_la_SOURCES = \
guestfs.c \
@@
-133,6
+133,7
@@
libguestfs_la_SOURCES = \
inspect_fs_cd.c \
inspect_fs_unix.c \
inspect_fs_windows.c \
inspect_fs_cd.c \
inspect_fs_unix.c \
inspect_fs_windows.c \
+ inspect_icon.c \
launch.c \
listfs.c \
match.c \
launch.c \
listfs.c \
match.c \
@@
-143,7
+144,15
@@
libguestfs_la_SOURCES = \
libguestfs_la_LIBADD = \
$(HIVEX_LIBS) $(AUGEAS_LIBS) $(PCRE_LIBS) $(MAGIC_LIBS) \
$(LIBVIRT_LIBS) $(LIBXML2_LIBS) \
libguestfs_la_LIBADD = \
$(HIVEX_LIBS) $(AUGEAS_LIBS) $(PCRE_LIBS) $(MAGIC_LIBS) \
$(LIBVIRT_LIBS) $(LIBXML2_LIBS) \
- $(LTLIBTHREAD) ../gnulib/lib/libgnu.la
+ ../gnulib/lib/libgnu.la \
+ $(GETADDRINFO_LIB) \
+ $(HOSTENT_LIB) \
+ $(INET_NTOP_LIB) \
+ $(LIBSOCKET) \
+ $(LIB_CLOCK_GETTIME) \
+ $(LIBINTL) \
+ $(LTLIBTHREAD) \
+ $(SERVENT_LIB)
# Make libguestfs include the convenience libraries.
noinst_LTLIBRARIES = liberrnostring.la libprotocol.la
# Make libguestfs include the convenience libraries.
noinst_LTLIBRARIES = liberrnostring.la libprotocol.la
@@
-151,23
+160,24
@@
libguestfs_la_LIBADD += liberrnostring.la libprotocol.la
libguestfs_la_CFLAGS = \
-DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"' \
libguestfs_la_CFLAGS = \
-DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"' \
+ -DGUESTFS_WARN_DEPRECATED=1 \
$(HIVEX_CFLAGS) $(AUGEAS_CFLAGS) $(PCRE_CFLAGS) \
$(LIBVIRT_CFLAGS) $(LIBXML2_CFLAGS) \
$(WARN_CFLAGS) $(WERROR_CFLAGS)
$(HIVEX_CFLAGS) $(AUGEAS_CFLAGS) $(PCRE_CFLAGS) \
$(LIBVIRT_CFLAGS) $(LIBXML2_CFLAGS) \
$(WARN_CFLAGS) $(WERROR_CFLAGS)
-libguestfs_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib
+libguestfs_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib
-I$(top_builddir)/gnulib/lib
if HAVE_RPCGEN
guestfs_protocol.c: guestfs_protocol.x
rm -f $@-t $@-t2
if HAVE_RPCGEN
guestfs_protocol.c: guestfs_protocol.x
rm -f $@-t $@-t2
- $(RPCGEN) -c -o $@-t $<
- sed 's,\.\./\
.\./src/,
,' < $@-t > $@-t2
+ $(RPCGEN) -c -o $@-t $
(srcdir)/$
<
+ sed 's,\.\./\
(\.\./\)*src,.
,' < $@-t > $@-t2
rm $@-t
mv $@-t2 $@
guestfs_protocol.h: guestfs_protocol.x
rm -f $@-t
rm $@-t
mv $@-t2 $@
guestfs_protocol.h: guestfs_protocol.x
rm -f $@-t
- $(RPCGEN) -h -o $@-t $<
+ $(RPCGEN) -h -o $@-t $
(srcdir)/$
<
mv $@-t $@
endif
mv $@-t $@
endif
@@
-182,12
+192,12
@@
stamp-guestfs.pod: guestfs.pod \
guestfs-actions.pod \
guestfs-availability.pod \
guestfs-structs.pod
guestfs-actions.pod \
guestfs-availability.pod \
guestfs-structs.pod
- $(top_
src
dir)/podwrapper.sh \
+ $(top_
build
dir)/podwrapper.sh \
--section 3 \
--man guestfs.3 \
--html $(top_builddir)/html/guestfs.3.html \
--section 3 \
--man guestfs.3 \
--html $(top_builddir)/html/guestfs.3.html \
- --insert guestfs-actions.pod:@ACTIONS@ \
- --insert guestfs-availability.pod:@AVAILABILITY@ \
- --insert guestfs-structs.pod:@STRUCTS@ \
+ --insert
$(srcdir)/
guestfs-actions.pod:@ACTIONS@ \
+ --insert
$(srcdir)/
guestfs-availability.pod:@AVAILABILITY@ \
+ --insert
$(srcdir)/
guestfs-structs.pod:@STRUCTS@ \
$<
touch $@
$<
touch $@