X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FMakefile.am;h=469f6d66cc9e9dfff4b8118c25b6da96314a1f3a;hb=a6832406fabf251ba89ed91a9f23624fa16f977f;hp=1906378d2b9b8642952b295df22284bdce2886de;hpb=98515732084c6856c2e22364b2ae64113c2c37c6;p=libguestfs.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 1906378..469f6d6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,11 +17,10 @@
 
 EXTRA_DIST = \
 	guestfs_protocol.x \
-	guestfs_protocol.c \
-	guestfs_protocol.h \
 	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
@@ -50,7 +49,15 @@ 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
 
 # From the libtool info file, with comments:
 #
@@ -98,20 +105,29 @@ 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 \
+	guestfs-internal.h \
 	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
-	rm -f $@-t
+	rm -f $@-t $@-t2
 	$(RPCGEN) -c -o $@-t $<
-	mv $@-t $@
+	sed 's,\.\./\.\./src/,,' < $@-t > $@-t2
+	rm $@-t
+	mv $@-t2 $@
 
 guestfs_protocol.h: guestfs_protocol.x
 	rm -f $@-t