X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2FMakefile;h=f2c3debd708657cd14edef17a55a9c5e67709d0d;hp=8abbcdc36ac97d9cda85ba85e79e5c425c6dae31;hb=2ba7e9962ea989863e152373e96a09b00a0b4eb8;hpb=29cc4023b50d6f7f9ab518978d8c9e839832b900

diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile
index 8abbcdc3..f2c3debd 100644
--- a/cinelerra-5.1/cinelerra/Makefile
+++ b/cinelerra-5.1/cinelerra/Makefile
@@ -223,8 +223,6 @@ OBJS = \
 	$(OBJDIR)/pluginvclient.o \
 	$(OBJDIR)/preferences.o \
 	$(OBJDIR)/preferencesthread.o \
-	$(OBJDIR)/presetsgui.o \
-	$(OBJDIR)/presets.o \
 	$(OBJDIR)/question.o \
 	$(OBJDIR)/quit.o \
 	$(OBJDIR)/recconfirmdelete.o \
@@ -409,9 +407,9 @@ $(OUTPUT): $(OBJS) $(DCRAW) $(FILEEXR) $(FILEFLAC) $(LIBRARIES)
 	$(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)
@@ -441,7 +439,7 @@ $(OBJDIR)/sha1.o:	sha1.C sha1.h
 	$(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) && \