babl r346 - in trunk: . extensions

[ok svn gnome org]

Author: ok
Date: Tue Jul  1 21:05:41 2008
New Revision: 346
URL: http://svn.gnome.org/viewvc/babl?rev=346&view=rev

Log:
* extensions/Makefile.am: applied patch from dmacks at netspace.org
cleaning up some of the build system.


Modified:
   trunk/ChangeLog
   trunk/extensions/Makefile.am

Modified: trunk/extensions/Makefile.am
==============================================================================
--- trunk/extensions/Makefile.am	(original)
+++ trunk/extensions/Makefile.am	Tue Jul  1 21:05:41 2008
@@ -13,11 +13,11 @@
 
 all-local: $(SOBJS)
 
-CFLAGS += \
-	-I $(top_builddir)		\
-	-I $(top_srcdir)		\
-	-I $(top_srcdir)/babl		\
-	-I $(top_srcdir)/extensions	\
+AM_CPPFLAGS = \
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_srcdir)/babl		\
+	-I$(top_srcdir)/extensions	\
 	-fPIC
 
 LDFLAGS += $(DYNAMICLIB)
@@ -29,7 +29,7 @@
 endif
 
 %$(SHREXT): %.c
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD)
+	$(CC) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD)
 
 # if extension needing external libraries are to be # compiled with this make
 # file, each of them can be added according to the this pattern:
@@ -37,12 +37,13 @@
 #	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<  [own compile and link flags]
 
 CIE-Lab$(SHREXT): CIE-Lab.c
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD)
+	$(CC) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD)
 
 sse-fixups$(SHREXT): sse-fixups.c
 	$(CC) $(CFLAGS) $(MMX_EXTRA_CFLAGS) $(SSE_EXTRA_CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD)
 #lcms$(SHREXT): lcms.c
-#	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) `pkg-config lcms --cflags --libs`
+
+#	$(CC) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) `pkg-config lcms --cflags --libs`
 #############################################################################
 
 clean-local: