X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=src%2FMakefile.am;h=e38c336a1b24fcc24297e41ee7a36cd9be39a2c2;hp=292e2eccfc9b5c1c2b453e514441b0741283a853;hb=df63ba5e7d916444bb1adae886e5135e8d278b28;hpb=56f7a8a4c8af55d09caef883b60e61e8569ef5a1 diff --git a/src/Makefile.am b/src/Makefile.am index 292e2ec..e38c336 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -17,8 +17,6 @@ EXTRA_DIST = \ guestfs_protocol.x \ - guestfs_protocol.c \ - guestfs_protocol.h \ MAX_PROC_NR \ stamp-generator \ generator.ml @@ -30,10 +28,10 @@ EXTRA_DIST = \ noinst_DATA = stamp-generator stamp-generator: generator.ml - mkdir -p $(top_builddir)/perl/lib/Sys - mkdir -p $(top_builddir)/ruby/ext/guestfs - mkdir -p $(top_builddir)/java/com/redhat/et/libguestfs - cd $(top_builddir) && ocaml -warn-error A ./src/$< + 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 guestfs_protocol.x: stamp-generator @@ -50,8 +48,18 @@ BUILT_SOURCES = \ guestfs-actions.c \ guestfs-bindtests.c +# 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 = + $(BUILT_SOURCES): stamp-generator +CLEANFILES = guestfs_protocol.c guestfs_protocol.h + # From the libtool info file, with comments: # # | 1. Start with version information of `0:0:0' for each libtool library. @@ -98,20 +106,28 @@ 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 - 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