and make the generic loaders project actually put loaders in the new

location



SVN revision: 63104

5 files changed, 72 insertions, 67 deletions

diff --git a/src/bin/gst/Makefile.am b/src/bin/gst/Makefile.am
index 797ed74..dbde260 100644
--- a/src/bin/gst/Makefile.am
+++ b/src/bin/gst/Makefile.am
@@ -13,6 +13,7 @@ AM_CPPFLAGS = \
 @GSTREAMER_CFLAGS@
 
 bin_PROGRAMS = evas_image_loader.gst
+bindir = $(libdir)/evas/utils
 
 evas_image_loader_gst_SOURCES = \
 main.cpp \
@@ -25,50 +26,50 @@ evas_image_loader_gst_LDFLAGS =
 ## http://www.fileinfo.com/filetypes/video
 ## should check which ones gst does support and make sure they are here
 install-data-hook:
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.264
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.3g2
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.3gp
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.3gp2
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.3gpp
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.3gpp2
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.3p2
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.asf
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.avi
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.bdm
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.bdmv
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.clpi
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.cpi
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.fla
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.flv
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.m1v
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.m2t
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.m2v
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.m4v
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.mkv
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.mov
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.mp2
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.mp2ts
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.mp4
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.mpe
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.mpeg
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.mpg
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.mpl
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.mpls
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.mts
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.mxf
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.nut
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.nuv
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.ogg
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.ogm
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.ogv
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.rm
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.rmj
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.rmm
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.rms
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.rmx
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.rmvb
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.swf
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.ts
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.webm
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.weba
-	ln -sf evas_image_loader.gst $(DESTDIR)$(bindir)/evas_image_loader.wmv
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.264
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.3g2
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.3gp
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.3gp2
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.3gpp
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.3gpp2
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.3p2
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.asf
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.avi
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.bdm
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.bdmv
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.clpi
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.cpi
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.fla
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.flv
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.m1v
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.m2t
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.m2v
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.m4v
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.mkv
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.mov
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.mp2
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.mp2ts
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.mp4
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.mpe
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.mpeg
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.mpg
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.mpl
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.mpls
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.mts
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.mxf
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.nut
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.nuv
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.ogg
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.ogm
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.ogv
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.rm
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.rmj
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.rmm
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.rms
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.rmx
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.rmvb
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.swf
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.ts
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.webm
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.weba
+	ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.wmv
diff --git a/src/bin/pdf/Makefile.am b/src/bin/pdf/Makefile.am
index a909b01..5fc4f23 100644
--- a/src/bin/pdf/Makefile.am
+++ b/src/bin/pdf/Makefile.am
@@ -13,6 +13,7 @@ AM_CPPFLAGS = \
 @POPPLER_CFLAGS@
 
 bin_PROGRAMS = evas_image_loader.pdf
+bindir = $(libdir)/evas/utils
 
 evas_image_loader_pdf_SOURCES = \
 main.cpp \
diff --git a/src/bin/ps/Makefile.am b/src/bin/ps/Makefile.am
index f0c3ba5..95f025e 100644
--- a/src/bin/ps/Makefile.am
+++ b/src/bin/ps/Makefile.am
@@ -13,6 +13,7 @@ AM_CPPFLAGS = \
 @SPECTRE_CFLAGS@
 
 bin_PROGRAMS = evas_image_loader.ps
+bindir = $(libdir)/evas/utils
 
 evas_image_loader_ps_SOURCES = \
 main.c \
diff --git a/src/bin/raw/Makefile.am b/src/bin/raw/Makefile.am
index 461ecf6..6424943 100644
--- a/src/bin/raw/Makefile.am
+++ b/src/bin/raw/Makefile.am
@@ -13,6 +13,7 @@ AM_CPPFLAGS = \
 
 if HAVE_RAW
 bin_PROGRAMS = evas_image_loader.raw
+bindir = $(libdir)/evas/utils
 
 evas_image_loader_raw_SOURCES = main.c $(top_srcdir)/src/bin/common/shmfile.c
 evas_image_loader_raw_CFLAGS = @LIBRAW_CFLAGS@
@@ -21,22 +22,22 @@ evas_image_loader_raw_LDFLAGS =
 endif
 
 install-data-hook:
-	ln -sf evas_image_loader.raw $(DESTDIR)$(bindir)/evas_image_loader.arw
-	ln -sf evas_image_loader.raw $(DESTDIR)$(bindir)/evas_image_loader.cr2
-	ln -sf evas_image_loader.raw $(DESTDIR)$(bindir)/evas_image_loader.crw
-	ln -sf evas_image_loader.raw $(DESTDIR)$(bindir)/evas_image_loader.dcr
-	ln -sf evas_image_loader.raw $(DESTDIR)$(bindir)/evas_image_loader.dng
-	ln -sf evas_image_loader.raw $(DESTDIR)$(bindir)/evas_image_loader.k25
-	ln -sf evas_image_loader.raw $(DESTDIR)$(bindir)/evas_image_loader.kdc
-	ln -sf evas_image_loader.raw $(DESTDIR)$(bindir)/evas_image_loader.erf
-	ln -sf evas_image_loader.raw $(DESTDIR)$(bindir)/evas_image_loader.mrw
-	ln -sf evas_image_loader.raw $(DESTDIR)$(bindir)/evas_image_loader.nef
-	ln -sf evas_image_loader.raw $(DESTDIR)$(bindir)/evas_image_loader.nrf
-	ln -sf evas_image_loader.raw $(DESTDIR)$(bindir)/evas_image_loader.nrw
-	ln -sf evas_image_loader.raw $(DESTDIR)$(bindir)/evas_image_loader.orf
-	ln -sf evas_image_loader.raw $(DESTDIR)$(bindir)/evas_image_loader.rw2
-	ln -sf evas_image_loader.raw $(DESTDIR)$(bindir)/evas_image_loader.pef
-	ln -sf evas_image_loader.raw $(DESTDIR)$(bindir)/evas_image_loader.raf
-	ln -sf evas_image_loader.raw $(DESTDIR)$(bindir)/evas_image_loader.sr2
-	ln -sf evas_image_loader.raw $(DESTDIR)$(bindir)/evas_image_loader.srf
-	ln -sf evas_image_loader.raw $(DESTDIR)$(bindir)/evas_image_loader.x3f
+	ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.arw
+	ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.cr2
+	ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.crw
+	ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.dcr
+	ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.dng
+	ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.k25
+	ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.kdc
+	ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.erf
+	ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.mrw
+	ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.nef
+	ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.nrf
+	ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.nrw
+	ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.orf
+	ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.rw2
+	ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.pef
+	ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.raf
+	ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.sr2
+	ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.srf
+	ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.x3f
diff --git a/src/bin/xcf/Makefile.am b/src/bin/xcf/Makefile.am
index 6c85eb2..6f22051 100644
--- a/src/bin/xcf/Makefile.am
+++ b/src/bin/xcf/Makefile.am
@@ -12,6 +12,7 @@ AM_CPPFLAGS = \
 @EINA_CFLAGS@
 
 bin_PROGRAMS = evas_image_loader.xcf
+bindir = $(libdir)/evas/utils
 
 evas_image_loader_xcf_SOURCES = \
 main.c pixelfuncs.c common.h \
@@ -21,4 +22,4 @@ evas_image_loader_xcf_LDADD = @EINA_LIBS@ -lz -lm @SHM_OPEN_LIBS@
 evas_image_loader_xcf_LDFLAGS =
 
 install-data-hook:
-	ln -sf evas_image_loader.xcf $(DESTDIR)$(bindir)/evas_image_loader.xcf.gz
+	ln -sf evas_image_loader.xcf $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.xcf.gz