E CVS: epplets mej

[<enl...@li...>]

Enlightenment CVS committal

Author  : mej
Project : e16
Module  : epplets

Dir     : e16/epplets/epplets


Modified Files:
	Makefile.am 


Log Message:
Tue Jul 29 22:20:38 EDT 2003
(KainX)

Applied patch from Kim Woelders <ki...@wo...> for various build fixes.


===================================================================
RCS file: /cvsroot/enlightenment/e16/epplets/epplets/Makefile.am,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -3 -r1.90 -r1.91
--- Makefile.am	14 Aug 2002 03:47:19 -0000	1.90
+++ Makefile.am	30 Jul 2003 02:21:17 -0000	1.91
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.90 2002/08/14 03:47:19 mej Exp $
+# $Id: Makefile.am,v 1.91 2003/07/30 02:21:17 mej Exp $
 
 bindir = $(EBIN)
 edatadir = $(EROOT)
@@ -158,10 +158,6 @@
 E_GtkRc_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir) $(X_LIBS)
 E_GtkRc_epplet_LDADD = $(top_builddir)/api/libepplet.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS)
 
-E_Areas_epplet_SOURCES = E-Areas.c
-E_Areas_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Areas_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
-
 E_Mountbox_epplet_SOURCES = E-Mountbox.c E-Mountbox.h
 E_Mountbox_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
 E_Mountbox_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
@@ -301,19 +297,21 @@
 	done
 	$(INSTALL_DATA) $(srcdir)/$(BG_SRC) $(DESTDIR)$(edatadir)/epplet_data/
 	$(INSTALL_DATA) $(srcdir)/$(FONT_SRC) $(DESTDIR)$(edatadir)/epplet_data/
-	@cd $(DESTDIR)$(edatadir)/epplet_data/ ; \
-	for i in $(NEED_BG) ; do \
+	@for i in $(NEED_BG) ; do \
 	  about_dir="$(DESTDIR)$(edatadir)/epplet_data/$$i/$${i}.ABOUT" ; \
 	  echo "test -d  $$about_dir || $(mkinstalldirs) $$about_dir" ; \
 	  test -d  $$about_dir || $(mkinstalldirs) $$about_dir ; \
 	  echo "test -f $$about_dir/$(BG_SRC) || ln -sf ../../$(BG_SRC) $$about_dir || :" ; \
 	  test -f $$about_dir/$(BG_SRC) || ln -sf ../../$(BG_SRC) $$about_dir || : ; \
 	done
-	@cd $(DESTDIR)$(edatadir)/epplet_data/ ; \
-	for i in $(NEED_FONT) ; do \
+	@for i in $(NEED_FONT) ; do \
 	  about_dir="$(DESTDIR)$(edatadir)/epplet_data/$$i/$${i}.ABOUT" ; \
 	  echo "test -d  $$about_dir || $(mkinstalldirs) $$about_dir" ; \
 	  test -d  $$about_dir || $(mkinstalldirs) $$about_dir ; \
 	  echo "test -f $$about_dir/$(FONT_SRC) || ln -sf ../../$(FONT_SRC) $$about_dir || :" ; \
 	  test -f $$about_dir/$(FONT_SRC) || ln -sf ../../$(FONT_SRC) $$about_dir || : ; \
 	done
+
+uninstall-local:
+	$(RM) $(DESTDIR)$(edatadir)/epplet_data/$(BG_SRC)
+	$(RM) $(DESTDIR)$(edatadir)/epplet_data/$(FONT_SRC)