X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=src%2FMakefile.am;h=4fb466dbef1b32e85a2280d86a97d0b040153a6d;hb=c0465ca3ae5cd55dbc5dc6d3a511ae5431985d3b;hp=8d03a77c3ed50e9f3dad14c77811bf5216df3e5d;hpb=1d8afa2416416acaf8b7ffc500cadfde13e3aca3;p=libguestfs.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 8d03a77..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
@@ -56,8 +55,6 @@ libprotocol_la_SOURCES = \
 
 libprotocol_la_CFLAGS =
 
-$(BUILT_SOURCES): stamp-generator
-
 CLEANFILES = guestfs_protocol.c guestfs_protocol.h
 
 # From the libtool info file, with comments:
@@ -115,7 +112,9 @@ libguestfs_la_SOURCES = \
 noinst_LTLIBRARIES = libprotocol.la
 libguestfs_la_LIBADD = libprotocol.la
 
-libguestfs_la_CFLAGS = -Wall -DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"'
+libguestfs_la_CFLAGS = \
+  -DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"' \
+  $(WARN_CFLAGS) $(WERROR_CFLAGS)
 
 libguestfs_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib