fix trace locks hang, drag handle rework-again, 12 reset btns on plugins, booby on

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

diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile
index 5f7bcbdb2a46af20e765cafb5e37c1a45e961c6b..43c66e8fb934e2ebf5721c5928c21bb407d31fef 100644 (file)
--- a/cinelerra-5.1/cinelerra/Makefile
+++ b/cinelerra-5.1/cinelerra/Makefile
@@ -287,6 +287,7 @@ OBJS := \
        $(OBJDIR)/trackcanvas.o \
        $(OBJDIR)/tracking.o \
        $(OBJDIR)/track.o \
+       $(OBJDIR)/trackpopup.o \
        $(OBJDIR)/trackscroll.o \
        $(OBJDIR)/tracksedit.o \
        $(OBJDIR)/tracks.o \
@@ -499,14 +500,14 @@ LDFLAGS1 = \
 LDFLAGS2 = -lcpml -lcxxstdma_rh60 -lcxxma_rh60 -lc -lots \
        `expr /usr/lib/compaq/cxx-*/alpha-linux/`bin/crtend.o \
        `expr /usr/lib/compaq/cxx-*/alpha-linux/`bin/crtn.o --no-demangle \
-       --warn-once
+       --warn-once $(LDFLAGS)
 LINKER = ld -o $(OUTPUT)
 CFLAGS += -DUSE_ALPHA
 
 else
 
 LDFLAGS1 = -Wl,-export-dynamic -g
-LDFLAGS2 =
+LDFLAGS2 = $(LDFLAGS)
 LINKER = $(CXX) -o $(OUTPUT)
 
 endif