Revision 27217159

View differences:

Makefile
22 22

  
23 23
PROGS       = $(addsuffix   $(EXESUF), $(PROGS-yes))
24 24
PROGS_G     = $(addsuffix _g$(EXESUF), $(PROGS-yes))
25
SRCS        = $(addsuffix .c,          $(PROGS-yes)) cmdutils.c
25 26
MANPAGES    = $(addprefix doc/, $(addsuffix .1, $(PROGS-yes)))
26 27

  
27 28
BASENAMES   = ffmpeg ffplay ffserver
......
44 45
INSTALL_TARGETS-$(BUILD_DOC)    += install-man
45 46
endif
46 47

  
48
main: lib $(PROGS_G) $(PROGS) $(ALL_TARGETS-yes)
49

  
50
%$(EXESUF): %_g$(EXESUF)
51
	cp -p $< $@
52
	$(STRIP) $@
53

  
54
vhook/%.o: vhook/%.c
55
	$(CC) $(VHOOKCFLAGS) -c -o $@ $<
56

  
47 57
VHOOKCFLAGS += $(filter-out -mdynamic-no-pic,$(CFLAGS))
48 58

  
49 59
BASEHOOKS = fish null watermark
......
64 74

  
65 75
VHOOKCFLAGS += $(VHOOKCFLAGS-yes)
66 76

  
67
SRCS = $(addsuffix .c, $(PROGS-yes)) cmdutils.c
68 77
LDFLAGS := -L$(BUILD_ROOT)/libavdevice -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil $(LDFLAGS)
69 78
EXTRALIBS := -lavdevice$(BUILDSUF) -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)
70 79

  
......
81 90
MAKE-yes = $(MAKE)
82 91
MAKE-    = : $(MAKE)
83 92

  
84
main: lib $(PROGS_G) $(PROGS) $(ALL_TARGETS-yes)
85

  
86 93
lib:
87 94
	$(MAKE)                    -C libavutil   all
88 95
	$(MAKE)                    -C libavcodec  all
......
98 105
%_g$(EXESUF): %.o cmdutils.o .libs
99 106
	$(CC) $(LDFLAGS) -o $@ $< cmdutils.o $(EXTRALIBS)
100 107

  
101
%$(EXESUF): %_g$(EXESUF)
102
	cp -p $< $@
103
	$(STRIP) $@
104

  
105 108
SVN_ENTRIES = $(SRC_PATH_BARE)/.svn/entries
106 109
ifeq ($(wildcard $(SVN_ENTRIES)),$(SVN_ENTRIES))
107 110
version.h: $(SVN_ENTRIES)
......
126 129
vhook/%$(SLIBSUF): vhook/%.o
127 130
	$(CC) $(LDFLAGS) -o $@ $(VHOOKSHFLAGS) $< $(VHOOKLIBS) $(LIBS_$(@F))
128 131

  
129
vhook/%.o: vhook/%.c
130
	$(CC) $(VHOOKCFLAGS) -c -o $@ $<
131

  
132 132
%.o: %.c
133 133
	$(CC) $(CFLAGS) -c -o $@ $<
134 134

  

Also available in: Unified diff