X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=resize%2FMakefile.am;h=5046a8c93dc5750baed1571e0e5aa788e68a7fa1;hb=eb7ec6170eca278fb910e18ca1f7ca81c6b507c0;hp=32c5325c6a2dd766bd21ace862329c87607d5678;hpb=63898268101e5ec91c8dac46651dbee5976272ce;p=libguestfs.git diff --git a/resize/Makefile.am b/resize/Makefile.am index 32c5325..5046a8c 100644 --- a/resize/Makefile.am +++ b/resize/Makefile.am @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. include $(top_srcdir)/subdir-rules.mk @@ -25,7 +25,6 @@ EXTRA_DIST = \ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-resize test.img if HAVE_OCAML -if HAVE_OCAML_PCRE # Alphabetical order. SOURCES = \ @@ -49,7 +48,7 @@ bin_SCRIPTS = virt-resize # -I $(top_builddir)/src/.libs is a hack which forces corresponding -L # option to be passed to gcc, so we don't try linking against an # installed copy of libguestfs. -OCAMLPACKAGES = -package pcre -I $(top_builddir)/src/.libs -I ../ocaml +OCAMLPACKAGES = -package str -I $(top_builddir)/src/.libs -I ../ocaml OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX $(OCAMLPACKAGES) OCAMLOPTFLAGS = $(OCAMLCFLAGS) @@ -124,7 +123,6 @@ include .depend .PHONY: depend docs endif -endif # Parallel builds don't obey dependencies for some reason we # don't understand.