move efm to separate dir, update makefiles

SVN revision: 53050

diff --git a/configure.ac b/configure.ac
index 5206156..cdc2ca4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -615,6 +615,7 @@ enlightenment.spec
 enlightenment.pc
 src/Makefile
 src/bin/Makefile
+src/bin/e_fm/Makefile
 src/modules/Makefile
 src/modules/ibar/Makefile
 src/modules/ibar/module.desktop

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 860907c..ab2f742 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = e_fm
+
 MAINTAINERCLEANFILES = Makefile.in
 
 INCLUDES = -I$(top_builddir) \
@@ -23,7 +25,6 @@ enlightenment_start
 internal_bindir = $(libdir)/enlightenment/utils
 internal_bin_PROGRAMS = \
 enlightenment_init \
-enlightenment_fm \
 enlightenment_fm_op \
 enlightenment_sys \
 enlightenment_thumb
@@ -339,15 +340,6 @@ e_sha1.c
 
 enlightenment_thumb_LDADD = @E_THUMB_LIBS@
 
-enlightenment_fm_SOURCES = \
-e_fm_main.c \
-e_fm_ipc.c \
-e_user.c \
-e_sha1.c
-
-enlightenment_fm_LDADD = @E_FM_LIBS@
-enlightenment_fm_CFLAGS = $(INCLUDES)
-
 enlightenment_fm_op_SOURCES = \
 e_fm_op.c
 

diff --git a/src/bin/e_fm_ipc.c b/src/bin/e_fm/e_fm_ipc.c
similarity index 100%
rename from src/bin/e_fm_ipc.c
rename to src/bin/e_fm/e_fm_ipc.c

diff --git a/src/bin/e_fm_ipc.h b/src/bin/e_fm/e_fm_ipc.h
similarity index 100%
rename from src/bin/e_fm_ipc.h
rename to src/bin/e_fm/e_fm_ipc.h

diff --git a/src/bin/e_fm_main.c b/src/bin/e_fm/e_fm_main.c
similarity index 100%
rename from src/bin/e_fm_main.c
rename to src/bin/e_fm/e_fm_main.c