X-Git-Url: https://cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2FMakefile;h=4c08bbf0b48feb3c051f1bf7ec9f98e2949df008;hb=2a56d102d9db53017b306f2a61a2382f29a75783;hp=e9d67aa56c8875439fc7b7d4f0ec50b71b9b482f;hpb=ee1879b1a1850e1d4e19c034d4a9c5459274bbb6;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile index e9d67aa5..4c08bbf0 100644 --- a/cinelerra-5.1/cinelerra/Makefile +++ b/cinelerra-5.1/cinelerra/Makefile @@ -271,6 +271,7 @@ OBJS := \ $(OBJDIR)/sharedlocation.o \ $(OBJDIR)/shbtnprefs.o \ $(OBJDIR)/shmemory.o \ + $(OBJDIR)/shuttle.o \ $(OBJDIR)/sighandler.o \ $(OBJDIR)/signalstatus.o \ $(OBJDIR)/splashgui.o \ @@ -500,14 +501,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 @@ -582,6 +583,11 @@ $(OBJDIR)/lv2ui.o: lv2ui.C $(OBJDIR)/pluginlv2ui.o $(OBJDIR)/lv2ui.o: $(CXX) `cat $(OBJDIR)/c_flags` $(GTK2_INCS) -DMSGQUAL=$* -c $< -o $@ +$(OBJDIR)/shuttle.o: shuttle.C shuttle_keys.h + $(CXX) `cat $(OBJDIR)/c_flags` -DMSGQUAL=$* -c $< -o $@ +shuttle_keys.h: /usr/include/X11/keysymdef.h + sed < /usr/include/X11/keysymdef.h > shuttle_keys.h -f shuttle.sed + $(OBJDIR)/lv2ui: $(LV2OBJS) @echo $(CXX) \`cat $(OBJDIR)/c_flags\` $^ -o $@ @$(CXX) `cat $(OBJDIR)/c_flags` $^ -o $@ $(LIBS) $(GTK2_LIBS)