X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=src%2FMakefile.am;h=4bcf7e9ea898c7e9b67e691e2ccf1a86be83cfac;hp=39fa2305142c4bb6e872ab7e77680d5f8b58a0b7;hb=ece3b30e4957b2d1d02377a82afb132e8061804d;hpb=5c31f6126ba4ea3e9056c34c300f6f5e332ab997

diff --git a/src/Makefile.am b/src/Makefile.am
index 39fa230..4bcf7e9 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
@@ -24,42 +24,26 @@ generator_built = \
 	guestfs-internal-actions.h \
 	actions.c \
 	bindtests.c \
+	errnostring_gperf.gperf \
+	errnostring.c \
+	errnostring.h
 	guestfs-actions.pod \
 	guestfs-availability.pod \
 	guestfs-structs.pod \
 	libguestfs.syms
 
-$(generator_built): stamp-generator
-
 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 \
 	libguestfs.3 \
 	guestfs.pod
 
-# 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
-
-stamp-generator: generator.ml ../images/test.iso
-	mkdir -p $(top_srcdir)/perl/lib/Sys
-	mkdir -p $(top_srcdir)/ruby/ext/guestfs
-	mkdir -p $(top_srcdir)/java/com/redhat/et/libguestfs
-	mkdir -p $(top_srcdir)/csharp
-	cd $(top_srcdir) && ocaml -warn-error A src/generator.ml
-
-../images/test.iso:
-	make -C ../images test.iso
-
 include_HEADERS = guestfs.h guestfs-actions.h guestfs-structs.h
 
 lib_LTLIBRARIES = libguestfs.la
@@ -72,6 +56,19 @@ libprotocol_la_SOURCES = \
 
 libprotocol_la_CFLAGS =
 
+# 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:
 #
 # |  1. Start with version information of `0:0:0' for each libtool library.
@@ -122,6 +119,7 @@ libguestfs_la_SOURCES = \
 	guestfs.h \
 	guestfs-actions.h \
 	guestfs-internal.h \
+	guestfs-structs.h \
 	guestfs_protocol.h \
 	gettext.h \
 	actions.c \
@@ -132,15 +130,15 @@ libguestfs_la_SOURCES = \
 	proto.c \
 	libguestfs.syms
 
-libguestfs_la_LIBADD = $(HIVEX_LIBS) $(LIBPCRE) $(LIBMAGIC) $(LTLIBTHREAD) ../gnulib/lib/libgnu.la
+libguestfs_la_LIBADD = $(HIVEX_LIBS) $(AUGEAS_LIBS) $(LIBPCRE) $(LIBMAGIC) $(LTLIBTHREAD) ../gnulib/lib/libgnu.la
 
-# Make libguestfs include the convenience library.
-noinst_LTLIBRARIES = libprotocol.la
-libguestfs_la_LIBADD += libprotocol.la
+# 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"' \
-  $(HIVEX_CFLAGS) \
+  $(HIVEX_CFLAGS) $(AUGEAS_CFLAGS) \
   $(WARN_CFLAGS) $(WERROR_CFLAGS)
 
 libguestfs_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib