babl r405 - in trunk: . babl babl/base docs tests

[martinn svn gnome org]

Author: martinn
Date: Tue Mar 31 17:09:29 2009
New Revision: 405
URL: http://svn.gnome.org/viewvc/babl?rev=405&view=rev

Log:
Don't use depecrated features or reduntant declarations in Makefile.am

Patch from Gary V. Vaughan

Modified:
   trunk/ChangeLog
   trunk/babl/Makefile.am
   trunk/babl/base/Makefile.am
   trunk/docs/Makefile.am
   trunk/tests/.gitignore
   trunk/tests/Makefile.am

Modified: trunk/babl/Makefile.am
==============================================================================
--- trunk/babl/Makefile.am	(original)
+++ trunk/babl/Makefile.am	Tue Mar 31 17:09:29 2009
@@ -56,9 +56,10 @@
 	babl-version.h			\
 	babl.h
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/babl/base
-
-AM_CPPFLAGS = -DLIBDIR=\""$(libdir)"\"
+AM_CPPFLAGS = \
+	-DLIBDIR=\""$(libdir)"\"	\
+	-I$(top_srcdir)			\
+	-I$(top_srcdir)/babl/base
 
 lib_LTLIBRARIES= libbabl- BABL_API_VERSION@.la
 libbabl_ BABL_API_VERSION@_la_SOURCES= $(h_sources) $(c_sources)

Modified: trunk/babl/base/Makefile.am
==============================================================================
--- trunk/babl/base/Makefile.am	(original)
+++ trunk/babl/base/Makefile.am	Tue Mar 31 17:09:29 2009
@@ -13,13 +13,13 @@
 	model-gray.c		\
 	model-ycbcr.c
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/babl
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/babl
 
 noinst_LTLIBRARIES= libbase.la
 libbase_la_SOURCES= $(h_sources) $(c_sources) 
+libbase_la_LIBADD = $(MATH_LIB)
 
 EXTRA_DIST = 		\
 	rgb-constants.h	\
 	util.h
 
-LDADD = $(MATH_LIB)

Modified: trunk/docs/Makefile.am
==============================================================================
--- trunk/docs/Makefile.am	(original)
+++ trunk/docs/Makefile.am	Tue Mar 31 17:09:29 2009
@@ -1,7 +1,7 @@
 # programs used for doc creation
 babl_fish_path_dhtml   = $(top_builddir)/tests/babl_fish_path_dhtml
 babl_fish_path_fitness = $(top_builddir)/tests/babl_fish_path_fitness
-babl_html_dump         = $(top_builddir)/tests/babl_html_dump
+babl_html_dump         = $(top_builddir)/tests/babl-html-dump
 
 .SILENT:
 SUBDIRS=      graphics

Modified: trunk/tests/.gitignore
==============================================================================
--- trunk/tests/.gitignore	(original)
+++ trunk/tests/.gitignore	Tue Mar 31 17:09:29 2009
@@ -1,7 +1,8 @@
-/Makefile
-/Makefile.in
 /.deps
 /.libs
+/Makefile
+/Makefile.in
+/babl-html-dump
 /babl_class_name
 /babl_fish_path_dhtml
 /babl_fish_path_fitness

Modified: trunk/tests/Makefile.am
==============================================================================
--- trunk/tests/Makefile.am	(original)
+++ trunk/tests/Makefile.am	Tue Mar 31 17:09:29 2009
@@ -10,18 +10,6 @@
 
 TESTS_ENVIRONMENT = BABL_PATH=$(top_builddir)/extensions/.libs
 
-grayscale_to_rgb_SOURCES        = grayscale_to_rgb.c
-rgb_to_bgr_SOURCES              = rgb_to_bgr.c
-srgb_to_lab_u8_SOURCES          = srgb_to_lab_u8.c
-rgb_to_ycbcr_SOURCES            = rgb_to_ycbcr.c
-babl_class_name_SOURCES         = babl_class_name.c
-sanity_SOURCES                  = sanity.c
-types_SOURCES                   = types.c
-babl_fish_path_fitness_SOURCES  = babl_fish_path_fitness.c
-babl_fish_path_dhtml_SOURCES    = babl_fish_path_dhtml.c
-formats_SOURCES                 = formats.c
-models_SOURCES                  = models.c
-
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/babl
 
 LDADD = $(top_builddir)/babl/libbabl- BABL_API_VERSION@.la \
@@ -31,12 +19,8 @@
 	introspect		\
 	babl_fish_path_fitness	\
 	babl_fish_path_dhtml	\
-	babl_html_dump		\
+	babl-html-dump		\
 	conversions		\
 	formats			\
 	nop			\
 	$(TESTS)
-
-introspect_SOURCES     = introspect.c
-babl_html_dump_SOURCES = babl-html-dump.c
-nop_SOURCES            = nop.c