projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add shuttle dev support, use dflt ff_a/v.png icons, mjpegtools typo patch
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
Makefile
diff --git
a/cinelerra-5.1/cinelerra/Makefile
b/cinelerra-5.1/cinelerra/Makefile
index e9d67aa56c8875439fc7b7d4f0ec50b71b9b482f..4c08bbf0b48feb3c051f1bf7ec9f98e2949df008 100644
(file)
--- 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)/sharedlocation.o \
$(OBJDIR)/shbtnprefs.o \
$(OBJDIR)/shmemory.o \
+ $(OBJDIR)/shuttle.o \
$(OBJDIR)/sighandler.o \
$(OBJDIR)/signalstatus.o \
$(OBJDIR)/splashgui.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 \
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
LINKER = ld -o $(OUTPUT)
CFLAGS += -DUSE_ALPHA
else
LDFLAGS1 = -Wl,-export-dynamic -g
-LDFLAGS2 =
+LDFLAGS2 =
$(LDFLAGS)
LINKER = $(CXX) -o $(OUTPUT)
endif
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)/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)
$(OBJDIR)/lv2ui: $(LV2OBJS)
@echo $(CXX) \`cat $(OBJDIR)/c_flags\` $^ -o $@
@$(CXX) `cat $(OBJDIR)/c_flags` $^ -o $@ $(LIBS) $(GTK2_LIBS)