fix messed up cut/paste in thirdparty/Makefile / last checkin

[goodguy/history.git] / cinelerra-5.1 / cinelerra / Makefile

diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile
index b487114079f51ff9fca1ca5cc5e402ce0245a4b3..11af09329c0fc2377b4d9047d9b7d1e32afff406 100644 (file)
--- a/cinelerra-5.1/cinelerra/Makefile
+++ b/cinelerra-5.1/cinelerra/Makefile
@@ -355,7 +355,6 @@ LIBS += \
        -lpthread \
        -lm \
        -lpng \
-       -ldl \
        -lz \
        -lbz2 \
        -llzma \
@@ -452,7 +451,7 @@ $(OUTPUT): $(OBJS) $(DCRAW) $(FILEEXR) $(FFMPEG_OBJS) $(FILEFLAC) $(LIBRARIES)
 
 $(CUTADS):     $(CUTOBJS) $(CUTLIBS)
        @echo g++ -o $@ $(CUTOBJS)
-       @g++ $(CFLAGS) -pthread -o $@ $(CUTOBJS) $(CUTLIBS)
+       @g++ $(CFLAGS) -pthread -o $@ $(CUTOBJS) $(CUTLIBS) $(LIBS)
 
 $(BDWRITE):    $(BDWOBJS) $(LIBRARIES)
        @echo g++ -o $@ $(BDWOBJS)
@@ -471,6 +470,9 @@ tags:
 $(OBJDIR)/%.o:         %.C
        $(CXX) `cat $(OBJDIR)/c_flags` -c $< -o $@
 
+$(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 -o $*.o