X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=src%2FMakefile.am;h=fa088fea545a2790cb588782d7cd22e33f18f244;hp=62a94c4dbd45126577697d874b8e0fdc7d7d6fc6;hb=75cc0fc72c190353dd36f1badf6b142ee4bec079;hpb=3b0d91890da5244dd642a5e7e9fa07312851693d

diff --git a/src/Makefile.am b/src/Makefile.am
index 62a94c4..fa088fe 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 # libguestfs
-# Copyright (C) 2009 Red Hat Inc.
+# Copyright (C) 2010 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,50 +17,58 @@
 
 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 \
-	guestfs-actions.c \
-	guestfs-bindtests.c
-
-$(generator_built): stamp-generator
+	actions.c \
+	bindtests.c \
+	errnostring_gperf.gperf \
+	errnostring.c \
+	errnostring.h \
+	guestfs-actions.pod \
+	guestfs-availability.pod \
+	guestfs-structs.pod \
+	libguestfs.syms
 
 BUILT_SOURCES = \
-  $(generator_built) \
-  guestfs_protocol.c \
-  guestfs_protocol.h
+	$(generator_built) \
+	guestfs_protocol.c \
+	guestfs_protocol.h \
+	errnostring_gperf.c
 
 EXTRA_DIST = \
 	$(BUILT_SOURCES) \
 	MAX_PROC_NR \
-	stamp-generator \
-	generator.ml
-
-# Rerun the generator if it has changed.
-# Git removes empty directories, so in cases where the
-# generator is creating the sole file in a directory, we
-# have to create the directory first.
-noinst_DATA = stamp-generator
+	libguestfs.3 \
+	guestfs.pod \
+	api-support/added \
+	api-support/README \
+	api-support/update-from-tarballs.sh
 
-stamp-generator: generator.ml
-	mkdir -p $(top_srcdir)/perl/lib/Sys
-	mkdir -p $(top_srcdir)/ruby/ext/guestfs
-	mkdir -p $(top_srcdir)/java/com/redhat/et/libguestfs
-	cd $(top_srcdir) && ocaml -warn-error A src/generator.ml
-
-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.
+liberrnostring_la_SOURCES = \
+	errnostring_gperf.c \
+	errnostring.h \
+	errnostring.c
+liberrnostring_la_CFLAGS =
+
+errnostring_gperf.c: errnostring_gperf.gperf
+	rm -f $@
+	$(GPERF) -t $< > $@-t
+	mv $@-t $@
 
 # From the libtool info file, with comments:
 #
@@ -103,26 +111,58 @@ libprotocol_la_CFLAGS =
 #
 # Note that this scheme means the real library version will always be
 # '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_SOURCES = \
 	guestfs.c \
 	guestfs.h \
-	guestfs-actions.h \
-	guestfs-actions.c \
-	guestfs-bindtests.c \
 	guestfs-internal.h \
-	guestfs-protocol.h \
-	gettext.h
-
-libguestfs_la_LIBADD = $(LTLIBTHREAD)
-
-# Make libguestfs include the convenience library.
-noinst_LTLIBRARIES = libprotocol.la
-libguestfs_la_LIBADD += libprotocol.la
+	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) $(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
+libguestfs_la_LIBADD += liberrnostring.la libprotocol.la
 
 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)
 
 libguestfs_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib
@@ -140,3 +180,24 @@ guestfs_protocol.h: guestfs_protocol.x
 	$(RPCGEN) -h -o $@-t $<
 	mv $@-t $@
 endif
+
+# Manual page.
+
+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
+
+stamp-guestfs.pod: guestfs.pod \
+		guestfs-actions.pod \
+		guestfs-availability.pod \
+		guestfs-structs.pod
+	$(top_srcdir)/podwrapper.sh \
+	  --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@ \
+	  $<
+	touch $@