cleanup

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/efreet@42876 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 8203339..658c73b 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -23,59 +23,40 @@ efreet_desktop.c \
 efreet_menu.c \
 efreet_utils.c \
 efreet_uri.c \
-efreet_private.h \
-efreet_xml.h \
-efreet_cache.c \
-$(EFREETHEADERS)
+efreet_cache.c
 
-libefreet_la_SOURCES = \
-       $(EFREETSOURCES)
+
+installed_headersdir = $(includedir)/efreet
+dist_installed_headers_DATA = $(EFREETHEADERS) Efreet_Mime.h Efreet_Trash.h
+
+libefreet_la_SOURCES = $(EFREETSOURCES)
 libefreet_la_CPPFLAGS =  \
 -DPACKAGE_DATA_DIR=\"$(datadir)\" \
--I$(top_builddir) \
--I$(top_srcdir) \
+-I$(top_builddir)/src/lib \
+-I$(top_srcdir)/src/lib \
 @EFL_EFREET_BUILD@ \
 @EFREET_CFLAGS@
 libefreet_la_LIBADD = @EFREET_LIBS@ @win32_libs@
 libefreet_la_LDFLAGS = -no-undefined -version-info @version_info@ @efreet_release_info@
 
-EFREETMIMEHEADERS = \
-Efreet_Mime.h
 
-EFREETMIMESOURCES = \
-efreet_mime.c \
-$(EFREETMIMEHEADERS)
-
-libefreet_mime_la_SOURCES = \
-$(EFREETMIMESOURCES)
+libefreet_mime_la_SOURCES = efreet_mime.c
 libefreet_mime_la_CPPFLAGS = \
--I$(top_builddir) \
--I$(top_srcdir) \
+-I$(top_builddir)/src/lib \
+-I$(top_srcdir)/src/lib \
 @EFL_EFREET_MIME_BUILD@ \
 @EFREET_CFLAGS@
+libefreet_mime_la_LIBADD = @EFREET_LIBS@ libefreet.la @win32_libs@
+libefreet_mime_la_LDFLAGS = -no-undefined -version-info @version_info@ @efreet_mime_release_info@
 
 
-EFREETTRASHHEADERS = \
-Efreet_Trash.h
-
-EFREETTRASHSOURCES = \
-efreet_trash.c \
-$(EFREETTRASHHEADERS)
-
-libefreet_trash_la_SOURCES = \
-$(EFREETTRASHSOURCES)
+libefreet_trash_la_SOURCES = efreet_trash.c
 libefreet_trash_la_CPPFLAGS = \
--I$(top_builddir) \
--I$(top_srcdir) \
+-I$(top_builddir)/src/lib \
+-I$(top_srcdir)/src/lib \
 @EFL_EFREET_TRASH_BUILD@ \
 @EFREET_CFLAGS@
-
-
-installed_headersdir = $(prefix)/include/efreet
-installed_headers_DATA = $(EFREETHEADERS) $(EFREETMIMEHEADERS) $(EFREETTRASHHEADERS)
-
-libefreet_mime_la_LDFLAGS = -no-undefined -version-info @version_info@ @efreet_mime_release_info@
+libefreet_trash_la_LIBADD = @EFREET_LIBS@ libefreet.la
 libefreet_trash_la_LDFLAGS = -no-undefined -version-info @version_info@ @efreet_trash_release_info@
 
-libefreet_mime_la_LIBADD = @EFREET_LIBS@ libefreet.la @win32_libs@
-libefreet_trash_la_LIBADD = @EFREET_LIBS@ libefreet.la
+EXTRA_DIST = efreet_private.h efreet_xml.h