From 7e3d3eb914169d3cde89fed0a4709fa6a3d968b5 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Sun, 4 Dec 2011 23:16:25 +0000
Subject: [PATCH] another failure attempt at pleasing Demon Lord Vincent Torri

SVN revision: 65877
---
 legacy/eeze/src/lib/Makefile.am | 44 ++++++++++++++-------------------
 1 file changed, 18 insertions(+), 26 deletions(-)

diff --git a/legacy/eeze/src/lib/Makefile.am b/legacy/eeze/src/lib/Makefile.am
index fa729ba9ce..eb3a18fac3 100644
--- a/legacy/eeze/src/lib/Makefile.am
+++ b/legacy/eeze/src/lib/Makefile.am
@@ -2,24 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = @EEZE_CFLAGS@
 
-if HAVE_EEZE_MOUNT
-  AM_CFLAGS = @EEZE_CFLAGS@ @LIBMOUNT_CFLAGS@ @ECORE_FILE_CFLAGS@
-  MOUNT_FILES = eeze_disk.c eeze_disk_udev.c eeze_disk_mount.c
-if OLD_LIBMOUNT
-  MOUNT_FILES += eeze_disk_libmount_old.c
-else
-  MOUNT_FILES += eeze_disk_libmount.c
-endif
-  MOUNT_INCLUDES = Eeze_Disk.h
-else
-  AM_CFLAGS = @EEZE_CFLAGS@
-  MOUNT_FILES = 
-  MOUNT_INCLUDES =
-endif
-
-lib_LTLIBRARIES = libeeze.la
-includes_HEADERS = Eeze.h Eeze_Net.h $(MOUNT_INCLUDES)
-includesdir = $(includedir)/eeze-@VMAJ@
+includes_HEADERS = Eeze.h Eeze_Net.h
 
 libeeze_la_SOURCES = \
 eeze_main.c \
@@ -30,8 +13,23 @@ eeze_udev_private.h \
 eeze_udev_private.c \
 eeze_udev_syspath.c \
 eeze_udev_walk.c \
-eeze_udev_watch.c \
-$(MOUNT_FILES)
+eeze_udev_watch.c
+
+if HAVE_EEZE_MOUNT
+  AM_CFLAGS = @EEZE_CFLAGS@ @LIBMOUNT_CFLAGS@ @ECORE_FILE_CFLAGS@
+  libeeze_la_SOURCES += eeze_disk.c eeze_disk_udev.c eeze_disk_mount.c eeze_disk_private.h
+if OLD_LIBMOUNT
+  libeeze_la_SOURCES += eeze_disk_libmount_old.c
+else
+  libeeze_la_SOURCES += eeze_disk_libmount.c
+endif
+  includes_HEADERS += Eeze_Disk.h
+else
+  AM_CFLAGS = @EEZE_CFLAGS@
+endif
+
+lib_LTLIBRARIES = libeeze.la
+includesdir = $(includedir)/eeze-@VMAJ@
 
 if HAVE_EEZE_MOUNT
   libeeze_la_LIBADD = @EEZE_LIBS@ @LIBMOUNT_LIBS@ @ECORE_FILE_LIBS@
@@ -39,9 +37,3 @@ else
   libeeze_la_LIBADD = @EEZE_LIBS@
 endif
 libeeze_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
-
-EXTRA_DIST = eeze_disk.c eeze_disk_udev.c eeze_disk_mount.c \
-	eeze_disk_libmount_old.c \
-	eeze_disk_libmount.c \
-	Eeze_Disk.h \
-	eeze_disk_private.h