[Ffmpeg-cvslog] CVS: ffmpeg/vhook Makefile,1.31,1.32

[Diego Biurrun CVS]

Update of /cvsroot/ffmpeg/ffmpeg/vhook
In directory mail:/var2/tmp/cvs-serv11717

Modified Files:
	Makefile 
Log Message:
Simplify vhook build.


Index: Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/vhook/Makefile,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- Makefile	24 Mar 2006 20:34:00 -0000	1.31
+++ Makefile	18 May 2006 09:02:05 -0000	1.32
@@ -12,11 +12,13 @@
 
 ifeq ($(HAVE_IMLIB2),yes)
     HOOKS += imlib2$(SLIBSUF)
+    LDFLAGS += -lImlib2
 endif
 
 ifeq ($(HAVE_FREETYPE2),yes)
     HOOKS += drawtext$(SLIBSUF)
     CFLAGS += `freetype-config --cflags`
+    LDFLAGS += `freetype-config --libs`
 endif
 
 all: $(HOOKS)
@@ -30,12 +32,6 @@
 	install -d "$(libdir)/vhook"
 	install -m 755 $(HOOKS) "$(libdir)/vhook"
 
-imlib2$(SLIBSUF): imlib2.o
-	$(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $< -lImlib2
-
-drawtext$(SLIBSUF): drawtext.o
-	$(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $< `freetype-config --libs`
-
 %$(SLIBSUF): %.o
 	$(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $<