$(OBJDIR)/nestededls.o \
$(OBJDIR)/newfolder.o \
$(OBJDIR)/new.o \
+ $(OBJDIR)/overlaydirect.o \
$(OBJDIR)/overlayframe.o \
+ $(OBJDIR)/overlaynearest.o \
+ $(OBJDIR)/overlaysample.o \
$(OBJDIR)/packagedispatcher.o \
$(OBJDIR)/packagerenderer.o \
$(OBJDIR)/packagingengine.o \
$(OBJDIR)/pluginvclient.o \
$(OBJDIR)/preferences.o \
$(OBJDIR)/preferencesthread.o \
- $(OBJDIR)/presetsgui.o \
- $(OBJDIR)/presets.o \
$(OBJDIR)/question.o \
$(OBJDIR)/quit.o \
$(OBJDIR)/recconfirmdelete.o \
$(OBJDIR)/vautomation.o \
$(OBJDIR)/vdevice1394.o \
$(OBJDIR)/vdevicebase.o \
- $(OBJDIR)/vdevicebuz.o \
$(OBJDIR)/vdevicedvb.o \
$(OBJDIR)/vdevicempeg.o \
$(OBJDIR)/vdeviceprefs.o \
$(OBJDIR)/vdevicev4l2jpeg.o \
$(OBJDIR)/vdevicev4l2mpeg.o \
$(OBJDIR)/vdevicev4l2.o \
- $(OBJDIR)/vdevicev4l.o \
$(OBJDIR)/vdevicex11.o \
$(OBJDIR)/vedit.o \
$(OBJDIR)/vedits.o \
BDWRITE = $(OBJDIR)/bdwrite
BDWOBJS = $(OBJDIR)/bdwrite.o
-CFLAGS += \
+CFLAGS := \
-I$(GUICAST) \
-I$(LIBZMPEG3) \
$(static_incs) \
+ $(CFLAGS)
# Speed up linking with this linking sequence
ifeq ($(OBJDIR), alpha)
$(LINKER) `cat $(OBJDIR)/objs`
$(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(OUTPUT) $(OUTPUT_G))
$(if $(findstring -ggdb,$(CFLAGS)),,strip $(OUTPUT))
- ln -f -s $(OUTPUT) ci
+ ln -f -s ../bin/$(WANT_CIN) ci
-$(CUTADS): $(CUTOBJS) $(CUTLIBS)
+$(CUTADS): $(CUTOBJS) $(CUTLIBS) $(LIBRARIES)
@echo g++ -o $@ $(CUTOBJS)
@g++ $(CFLAGS) -pthread -o $@ $(CUTOBJS) $(CUTLIBS) $(LIBS)
$(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(CUTADS) $(CUTADS).debuginfo)
$(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(BDWRITE) $(BDWRITE).debuginfo)
$(if $(findstring -ggdb,$(CFLAGS)),,strip $(BDWRITE))
+ydiff: ydiff.C $(LIBRARIES)
+ @echo g++ -o $@ ydiff.C
+ @g++ `pkg-config --cflags --libs gtk+-2.0` $(CFLAGS) ydiff.C -o $@ $(LIBS)
+
clean:
rm -rf $(OBJDIR)
cp -a $(OBJDIR)/bdwrite $(BINDIR)/.
tags:
- ctags -R -h default --langmap=c:+.inc . ../guicast/ ../libzmpeg3 ../plugins
+ ctags -R -h default --langmap=c:+.inc . ../guicast/ ../libzmpeg3 ../plugins ../thirdparty/ffmpeg-*
$(OBJDIR)/%.o: %.C
$(CXX) `cat $(OBJDIR)/c_flags` -O3 -c $< -o $@
$(DCRAW): dcraw.c
- $(GCC) `cat $(OBJDIR)/c_flags` dcraw.c -c -o $*.o
+ $(GCC) `cat $(OBJDIR)/c_flags` -Wno-misleading-indentation dcraw.c -c -o $*.o
$(THEME_DATA):
cd $(OBJDIR) && \