X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=src%2FMakefile.am;h=4fb466dbef1b32e85a2280d86a97d0b040153a6d;hb=efad4f53;hp=c6006d2b3fbffb6ca271f678542a60787bbd0523;hpb=811b4a51dc25219e19527304892e7f688867e105;p=libguestfs.git

diff --git a/src/Makefile.am b/src/Makefile.am
index c6006d2..4fb466d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,7 +19,8 @@ EXTRA_DIST = \
 	guestfs_protocol.x \
 	MAX_PROC_NR \
 	stamp-generator \
-	generator.ml
+	generator.ml \
+	guestfs-internal-actions.h
 
 # Rerun the generator if it has changed.
 # Git removes empty directories, so in cases where the
@@ -33,8 +34,6 @@ stamp-generator: generator.ml
 	mkdir -p $(top_srcdir)/java/com/redhat/et/libguestfs
 	cd $(top_srcdir) && ocaml -warn-error A src/generator.ml
 
-guestfs_protocol.x: stamp-generator
-
 include_HEADERS = guestfs.h guestfs-actions.h guestfs-structs.h
 
 lib_LTLIBRARIES = libguestfs.la
@@ -48,7 +47,13 @@ BUILT_SOURCES = \
   guestfs-actions.c \
   guestfs-bindtests.c
 
-$(BUILT_SOURCES): stamp-generator
+# 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 =
 
 CLEANFILES = guestfs_protocol.c guestfs_protocol.h
 
@@ -98,14 +103,20 @@ libguestfs_la_LDFLAGS = -version-info $(MAX_PROC_NR):0:$(MAX_PROC_NR)
 libguestfs_la_SOURCES = \
 	guestfs.c \
 	guestfs.h \
-	guestfs_protocol.c \
-	guestfs_protocol.h \
 	guestfs-actions.h \
 	guestfs-actions.c \
 	guestfs-bindtests.c \
 	gettext.h
 
-libguestfs_la_CFLAGS = -Wall -DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"'
+# Make libguestfs include the convenience library.
+noinst_LTLIBRARIES = libprotocol.la
+libguestfs_la_LIBADD = libprotocol.la
+
+libguestfs_la_CFLAGS = \
+  -DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"' \
+  $(WARN_CFLAGS) $(WERROR_CFLAGS)
+
+libguestfs_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib
 
 if HAVE_RPCGEN
 guestfs_protocol.c: guestfs_protocol.x