Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : libs/imlib2_loaders

Dir     : e17/libs/imlib2_loaders/src


Modified Files:
        Makefile.am 


Log Message:
cleaned up autotools files
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2_loaders/src/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- Makefile.am 16 Apr 2004 05:24:52 -0000      1.15
+++ Makefile.am 17 Apr 2004 20:38:00 -0000      1.16
@@ -5,21 +5,13 @@
 # A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in Makefile
 
-CFLAGS_EDB           = @edb_includes@
-CFLAGS_EET           = @eet_includes@
-CFLAGS_IMLIB2        = @imlib2_includes@
 CFLAGS_EXTRA         = -I.. -W -Wall 
 
-LIBS_EDB             = @edb_libs@
-LIBS_EET             = @eet_libs@
-LIBS_IMLIB2          = @imlib2_libs@
+LIBS_ALL             = @EDB_LIBS@ @EET_LIBS@ @IMLIB2_LIBS@
 
-LIBS_ALL             = $(LIBS_EET) $(LIBS_EDB) $(LIBS_IMLIB2)
-CFLAGS_ALL           = $(CFLAGS_EET) $(CFLAGS_EDB) $(CFLAGS_IMLIB2) \
+INCLUDES             = @EDB_CFLAGS@ @EET_CFLAGS@ @IMLIB2_CFLAGS@ \
                        $(CFLAGS_EXTRA) $(X_CFLAGS)
 
-INCLUDES             = $(CFLAGS_ALL)
-
 pkgdir              = $(libdir)/imlib2_loaders/image
 
 if XCF_LOADER
@@ -34,8 +26,6 @@
 EET_L               = eet.la
 endif
 
-
-
 pkg_LTLIBRARIES      = $(XCF_L) $(EDB_L) $(EET_L) ico.la ani.la
 
 xcf_la_SOURCES       = \
@@ -45,21 +35,21 @@
        common.h \
        color_values.h
 xcf_la_LDFLAGS      = -no-undefined -module -avoid-version
-xcf_la_LIBADD       = $(LIBS_IMLIB2)
+xcf_la_LIBADD       = @IMLIB2_LIBS@
 
 db_la_SOURCES       = \
        loader_db.c \
        common.h \
        image.h
 db_la_LDFLAGS       = -no-undefined -module -avoid-version
-db_la_LIBADD        = $(LIBS_IMLIB2) $(LIBS_EDB) -ledb -lz
+db_la_LIBADD        = @IMLIB2_LIBS@ @EDB_LIBS@ -lz
 
 eet_la_SOURCES       = \
        loader_eet.c \
        common.h \
        image.h
 eet_la_LDFLAGS      = -no-undefined -module -avoid-version
-eet_la_LIBADD       = $(LIBS_IMLIB2) $(LIBS_EET) -leet -lz
+eet_la_LIBADD       = @IMLIB2_LIBS@ @EET_LIBS@ -lz
 
 ico_la_SOURCES       = \
        loader_ico.c \
@@ -67,7 +57,7 @@
        common.h \
        color_values.h
 ico_la_LDFLAGS      = -no-undefined -module -avoid-version
-ico_la_LIBADD       = $(LIBS_IMLIB2)
+ico_la_LIBADD       = @IMLIB2_LIBS@
 
 ani_la_SOURCES       = \
        loader_ani.c \
@@ -75,4 +65,4 @@
        common.h \
        color_values.h
 ani_la_LDFLAGS      = -no-undefined -module -avoid-version
-ani_la_LIBADD       = $(LIBS_IMLIB2)
+ani_la_LIBADD       = @IMLIB2_LIBS@




-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to