Revert "src/Makefile: move the new xen_xl_disk parser code at the correct place"

This reverts commit edacdb3d12256af4f6e31ec65c9dd4797fb3aa0d.

Signed-off-by: Jim Fehlig <jfehlig@suse.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index a6ea8e0abd1332b120cf7e2890c6f6ae3c91b1cc..850122a12535d2461631d7285028a2584c4c7f63 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1000,6 +1000,23 @@ CPU_SOURCES =                                                    \
 VMX_SOURCES =                                                  \
                vmx/vmx.c vmx/vmx.h
 
+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 += xenconfig/xen_xl_disk.h
+CLEANFILES += xenconfig/xen_xl_disk.h xenconfig/xen_xl_disk.c
+
+XENXLDISKPARSER_SOURCES = xenconfig/xen_xl_disk.l
+
+XENCONFIG_SOURCES =                                            \
+               xenconfig/xenxs_private.h                       \
+               xenconfig/xen_common.c xenconfig/xen_common.h   \
+               xenconfig/xen_sxpr.c xenconfig/xen_sxpr.h       \
+               xenconfig/xen_xm.c xenconfig/xen_xm.h           \
+               xenconfig/xen_xl.c xenconfig/xen_xl.h           \
+               xenconfig/xen_xl_disk_i.h
+
 pkgdata_DATA = cpu/cpu_map.xml
 
 EXTRA_DIST +=  $(pkgdata_DATA)
@@ -1053,23 +1070,6 @@ libvirt_vmx_la_SOURCES = $(VMX_SOURCES)
 endif WITH_VMX
 
 if WITH_XENCONFIG
-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 += xenconfig/xen_xl_disk.h
-CLEANFILES += xenconfig/xen_xl_disk.h xenconfig/xen_xl_disk.c
-
-XENXLDISKPARSER_SOURCES = xenconfig/xen_xl_disk.l
-
-XENCONFIG_SOURCES =                                            \
-               xenconfig/xenxs_private.h                       \
-               xenconfig/xen_common.c xenconfig/xen_common.h   \
-               xenconfig/xen_sxpr.c xenconfig/xen_sxpr.h       \
-               xenconfig/xen_xm.c xenconfig/xen_xm.h           \
-               xenconfig/xen_xl.c xenconfig/xen_xl.h           \
-               xenconfig/xen_xl_disk_i.h
-
 # Flex generated XL disk parser needs to be compiled without WARN_FLAGS
 # Add the generated object to its own library to control CFLAGS
 noinst_LTLIBRARIES += libvirt_xenxldiskparser.la