gegl r1848 - in trunk: . operations/workshop

[kcozens svn gnome org]

Author: kcozens
Date: Thu Jan 17 06:05:14 2008
New Revision: 1848
URL: http://svn.gnome.org/viewvc/gegl?rev=1848&view=rev

Log:
2008-01-17  Kevin Cozens  <kcozens cvs gnome org>

	* operations/workshop/Makefile.am: applied modified patch from Deji
	Akingunola which fixes syntax of 'if' used in the ff-save target.


Modified:
   trunk/ChangeLog
   trunk/operations/workshop/Makefile.am

Modified: trunk/operations/workshop/Makefile.am
==============================================================================
--- trunk/operations/workshop/Makefile.am	(original)
+++ trunk/operations/workshop/Makefile.am	Thu Jan 17 06:05:14 2008
@@ -29,13 +29,11 @@
 	-$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) `pkg-config gstreamer-0.10 --libs --cflags`
 
 ff-save$(SHREXT): ff-save.c $(GEGLHEADERS)
-	-$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) \
-	@if [ ! $(-z "$(AVCODEC_LIBS)") -o $(-z "$(AVFORMAT_LIBS)") ]; then \
+	@if [ -n "$(AVCODEC_LIBS)" ] && [ -n "$(AVFORMAT_LIBS)" ]; then \
 	echo $@;\
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) \
-		$(AVCODEC_CFLAGS) $(AVCODEC_LIBS) \
-		$(AVFORMAT_CFLAGS) $(AVFORMAT_LIBS) 
-		$(AVFORMAT_CFLAGS) $(AVFORMAT_LIBS);\
+		$(AVCODEC_CFLAGS) $(AVCODEC_LIBS)    \
+		$(AVFORMAT_CFLAGS) $(AVFORMAT_LIBS); \
 	fi
 
 gtk-display$(SHREXT): gtk-display.c $(GEGLHEADERS)