[Xen-devel] [PATCH 02/12] Revert "src/Makefile: Fix parallel build after xen_xl_disk parser introduction"

[Jim Fehlig <jfehlig@xxxxxxxx>]

This reverts commit 533349ff43ddf091026fbcb0d9a714d9cc570dc7.

Signed-off-by: Jim Fehlig <jfehlig@xxxxxxxx>
---
 src/Makefile.am | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 2eaaf11..a6ea8e0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1053,21 +1053,12 @@ libvirt_vmx_la_SOURCES = $(VMX_SOURCES)
 endif WITH_VMX
 
 if WITH_XENCONFIG
-# Disable the default rule for lex files because we need to generate the
-# xen_xl_disk files into srcdir instead of builddir.
-.l.c:
-
-$(XENXLDISKPARSER_GENERATED): $(XENXLDISKPARSER_SOURCES)
-       $(AM_V_LEX) $(LEXCOMPILE) $<
-
-AM_LFLAGS = -Pxl_disk_ --header-file=$(abs_srcdir)/xenconfig/xen_xl_disk.h \
-               --outfile=$(abs_srcdir)/xenconfig/xen_xl_disk.c
-XENXLDISKPARSER_GENERATED = xenconfig/xen_xl_disk.c xenconfig/xen_xl_disk.h
-
-BUILT_SOURCES += $(XENXLDISKPARSER_GENERATED)
+AM_LFLAGS = -Pxl_disk_ --header-file=../$*.h
+LEX_OUTPUT_ROOT = lex.xl_disk_
+BUILT_SOURCES += xenconfig/xen_xl_disk.c xenconfig/xen_xl_disk.h
 # Generated header file is not implicitly added to dist
-EXTRA_DIST += $(XENXLDISKPARSER_GENERATED)
-MAINTAINERCLEANFILES += $(XENXLDISKPARSER_GENERATED)
+EXTRA_DIST += xenconfig/xen_xl_disk.h
+CLEANFILES += xenconfig/xen_xl_disk.h xenconfig/xen_xl_disk.c
 
 XENXLDISKPARSER_SOURCES = xenconfig/xen_xl_disk.l
 
@@ -1087,8 +1078,6 @@ libvirt_xenxldiskparser_la_CFLAGS = \
                -I$(srcdir)/conf $(AM_CFLAGS) -Wno-unused-parameter
 libvirt_xenxldiskparser_la_SOURCES = \
        $(XENXLDISKPARSER_SOURCES)
-libvirt_xenxldiskparser_la_DEPENDENCIES = \
-       $(XENXLDISKPARSER_GENERATED)
 
 noinst_LTLIBRARIES += libvirt_xenconfig.la
 libvirt_la_BUILT_LIBADD += libvirt_xenconfig.la
-- 
1.8.4.5


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel