X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=src%2FMakefile.am;h=fa088fea545a2790cb588782d7cd22e33f18f244;hp=4bcf7e9ea898c7e9b67e691e2ccf1a86be83cfac;hb=75cc0fc72c190353dd36f1badf6b142ee4bec079;hpb=2066805a5d93b62beaf6653324715f0b62b06a05;ds=sidebyside

diff --git a/src/Makefile.am b/src/Makefile.am
index 4bcf7e9..fa088fe 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,16 +17,17 @@
 
 include $(top_srcdir)/subdir-rules.mk
 
+CLEANFILES = stamp-guestfs.pod
+
 generator_built = \
 	guestfs_protocol.x \
-	guestfs-structs.h \
-	guestfs-actions.h \
+	guestfs.h \
 	guestfs-internal-actions.h \
 	actions.c \
 	bindtests.c \
 	errnostring_gperf.gperf \
 	errnostring.c \
-	errnostring.h
+	errnostring.h \
 	guestfs-actions.pod \
 	guestfs-availability.pod \
 	guestfs-structs.pod \
@@ -42,19 +43,19 @@ EXTRA_DIST = \
 	$(BUILT_SOURCES) \
 	MAX_PROC_NR \
 	libguestfs.3 \
-	guestfs.pod
+	guestfs.pod \
+	api-support/added \
+	api-support/README \
+	api-support/update-from-tarballs.sh
 
-include_HEADERS = guestfs.h guestfs-actions.h guestfs-structs.h
+include_HEADERS = guestfs.h
 
 lib_LTLIBRARIES = libguestfs.la
 
-# This convenience library is solely to avoid compiler warnings
-# in its generated sources.
-libprotocol_la_SOURCES = \
-  guestfs_protocol.c \
-  guestfs_protocol.h
-
-libprotocol_la_CFLAGS =
+# This convenience library is solely to compile its generated sources with
+# custom flags.
+libprotocol_la_SOURCES = guestfs_protocol.c  guestfs_protocol.h
+libprotocol_la_CFLAGS = -Wall -Wno-unused -fno-strict-aliasing
 
 # Build the errnostring perfect hash code.  The generated code has lots
 # of warnings so we must compile it in a separate mini-library.
@@ -117,20 +118,41 @@ libguestfs_la_LDFLAGS += $(VERSION_SCRIPT_FLAGS)libguestfs.syms
 libguestfs_la_SOURCES = \
 	guestfs.c \
 	guestfs.h \
-	guestfs-actions.h \
 	guestfs-internal.h \
-	guestfs-structs.h \
 	guestfs_protocol.h \
 	gettext.h \
 	actions.c \
 	appliance.c \
 	bindtests.c \
+	dbdump.c \
+	events.c \
+	filearch.c \
 	inspect.c \
+	inspect_apps.c \
+	inspect_fs.c \
+	inspect_fs_cd.c \
+	inspect_fs_unix.c \
+	inspect_fs_windows.c \
+	inspect_icon.c \
 	launch.c \
+	listfs.c \
+	match.c \
 	proto.c \
+	virt.c \
 	libguestfs.syms
 
-libguestfs_la_LIBADD = $(HIVEX_LIBS) $(AUGEAS_LIBS) $(LIBPCRE) $(LIBMAGIC) $(LTLIBTHREAD) ../gnulib/lib/libgnu.la
+libguestfs_la_LIBADD = \
+	$(HIVEX_LIBS) $(AUGEAS_LIBS) $(PCRE_LIBS) $(MAGIC_LIBS) \
+	$(LIBVIRT_LIBS) $(LIBXML2_LIBS) \
+	../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
@@ -138,7 +160,9 @@ libguestfs_la_LIBADD += liberrnostring.la libprotocol.la
 
 libguestfs_la_CFLAGS = \
   -DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"' \
-  $(HIVEX_CFLAGS) $(AUGEAS_CFLAGS) \
+  -DGUESTFS_WARN_DEPRECATED=1 \
+  $(HIVEX_CFLAGS) $(AUGEAS_CFLAGS) $(PCRE_CFLAGS) \
+  $(LIBVIRT_CFLAGS) $(LIBXML2_CFLAGS) \
   $(WARN_CFLAGS) $(WERROR_CFLAGS)
 
 libguestfs_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib
@@ -158,38 +182,22 @@ guestfs_protocol.h: guestfs_protocol.x
 endif
 
 # Manual page.
-# guestfs-actions.pod, guestfs-availability.pod and guestfs-structs
-# are autogenerated.  There is no include mechanism for POD, so we
-# have to do it by hand.
 
 man_MANS = guestfs.3 libguestfs.3
+noinst_DATA = $(top_builddir)/html/guestfs.3.html
+
+guestfs.3 $(top_builddir)/html/guestfs.3.html: stamp-guestfs.pod
 
-guestfs.3: guestfs.pod \
+stamp-guestfs.pod: guestfs.pod \
 		guestfs-actions.pod \
 		guestfs-availability.pod \
 		guestfs-structs.pod
-	sed \
-	  -e '/@ACTIONS@/rguestfs-actions.pod' \
-	  -e 's/@ACTIONS@//' \
-	  -e '/@AVAILABILITY@/rguestfs-availability.pod' \
-	  -e 's/@AVAILABILITY@//' \
-	  -e '/@STRUCTS@/rguestfs-structs.pod' \
-	  -e 's/@STRUCTS@//' \
-	  < $< | \
-	$(POD2MAN) \
+	$(top_srcdir)/podwrapper.sh \
 	  --section 3 \
-	  -c "Virtualization Support" \
-	  --name "guestfs" \
-	  --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \
-	  > $@
-
-# Check user doesn't try to do 'make all' or 'make check' as root.
-# https://www.redhat.com/archives/libguestfs/2010-April/msg00098.html
-
-all-local: checkroot
-check-local: checkroot
-checkroot:
-	@if [ "`id -u`" = 0 ]; then \
-	    echo "*** Error: Don't run 'make' or 'make check' as root."; \
-	    exit 1; \
-	fi
+	  --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@ \
+	  $<
+	touch $@