Commit 302cdccf authored by Diego Biurrun's avatar Diego Biurrun

cosmetics: Reorder some entries for more consistency and readability.

Originally committed as revision 5744 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 2c779260
...@@ -10,7 +10,9 @@ ifeq ($(CONFIG_DARWIN),yes) ...@@ -10,7 +10,9 @@ ifeq ($(CONFIG_DARWIN),yes)
SHFLAGS = -dynamiclib -Wl,-single_module -flat_namespace \ SHFLAGS = -dynamiclib -Wl,-single_module -flat_namespace \
-undefined suppress -Wl,-install_name,$(libdir)/vhook/$@ -undefined suppress -Wl,-install_name,$(libdir)/vhook/$@
endif endif
HOOKS=null$(SLIBSUF) fish$(SLIBSUF) ppm$(SLIBSUF) watermark$(SLIBSUF) HOOKS=null$(SLIBSUF) fish$(SLIBSUF) ppm$(SLIBSUF) watermark$(SLIBSUF)
ALLHOOKS=$(HOOKS) imlib2$(SLIBSUF) drawtext$(SLIBSUF)
ifeq ($(HAVE_IMLIB2),yes) ifeq ($(HAVE_IMLIB2),yes)
HOOKS += imlib2$(SLIBSUF) HOOKS += imlib2$(SLIBSUF)
...@@ -23,10 +25,10 @@ ifeq ($(HAVE_FREETYPE2),yes) ...@@ -23,10 +25,10 @@ ifeq ($(HAVE_FREETYPE2),yes)
LDFLAGS += `freetype-config --libs` LDFLAGS += `freetype-config --libs`
endif endif
all: $(HOOKS)
SRCS := $(HOOKS:$(SLIBSUF)=.c) SRCS := $(HOOKS:$(SLIBSUF)=.c)
all: $(HOOKS)
depend: $(SRCS) depend: $(SRCS)
$(CC) -MM $(CFLAGS) $^ 1>.depend $(CC) -MM $(CFLAGS) $^ 1>.depend
...@@ -34,7 +36,6 @@ install: $(HOOKS) ...@@ -34,7 +36,6 @@ install: $(HOOKS)
install -d "$(libdir)/vhook" install -d "$(libdir)/vhook"
install -m 755 $(HOOKS) "$(libdir)/vhook" install -m 755 $(HOOKS) "$(libdir)/vhook"
ALLHOOKS=$(HOOKS) imlib2$(SLIBSUF) drawtext$(SLIBSUF)
uninstall: uninstall:
rm -f $(addprefix $(libdir)/vhook/,$(ALLHOOKS)) rm -f $(addprefix $(libdir)/vhook/,$(ALLHOOKS))
-rmdir "$(libdir)/vhook/" -rmdir "$(libdir)/vhook/"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment