X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugin_config;h=c4d3516df50cab3da512ffa1c0e9cda75b444c35;hb=55ccff122957ddfaa871cf8f251cfe866732c870;hp=77cb4c3fc7f3b1508ff0aa6e66885101470043be;hpb=29cc4023b50d6f7f9ab518978d8c9e839832b900;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/plugin_config b/cinelerra-5.1/plugin_config index 77cb4c3f..c4d3516d 100644 --- a/cinelerra-5.1/plugin_config +++ b/cinelerra-5.1/plugin_config @@ -8,7 +8,7 @@ $(shell mkdir -p $(OBJDIR)) PLUGIN_DIR := $(BINDIR)/plugins OUTPUT_DIR = $(PLUGIN_DIR)/$($(PLUGIN)) -PLUGIN_PNGS = $(wildcard $(foreach t,$(themes),$(t).png)) picon.png +PLUGIN_PNGS = $(wildcard picon_*.png) OUTPUT_PNGS = $(foreach png,$(PLUGIN_PNGS), $(PLUGIN_DIR)/$(basename $(png))/$(PLUGIN).png) OUTPUT = $(OUTPUT_DIR)/$(PLUGIN).plugin OUTPUT_G = $(OBJDIR)/$(PLUGIN).debuginfo @@ -18,8 +18,8 @@ $(shell echo $(LFLAGS) > $(OBJDIR)/l_flags) ifeq ($(OUTPUT_THEME),) -$(OUTPUT): $(OBJS) $(OUTPUT_DIR) $(OUTPUT_PNGS) - $(LDLINKER) -o $(OUTPUT) $(OBJS) `cat $(OBJDIR)/l_flags` +$(OUTPUT): $(OBJS) $(OUTPUT_DIR) $(OUTPUT_PNGS) $(OUTPUT_BINS) + $(LDLINKER) -o $(OUTPUT) $(OBJS) $(OUTPUT_BINS) `cat $(OBJDIR)/l_flags` $(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(OUTPUT) $(OUTPUT_G)) $(if $(findstring -ggdb,$(CFLAGS)),,strip $(OUTPUT)) @@ -45,16 +45,15 @@ $(PLUGIN_DIR)/%/$(PLUGIN).png: %.png $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) cp -a $< $@ -clean: - find \( -name core -o -name '*.o' -o -name '*.a' \) -exec rm -f {} \; +clean:: rm -f $(OUTPUT) rm -rf $(OBJDIR) wc: cat *.C *.h | wc -$(OBJS): - $(CC) -c `cat $(OBJDIR)/c_flags` $(subst $(OBJDIR)/,, $*.C) -o $*.o +$(OBJDIR)/%.o: %.C + $(CXX) `cat $(OBJDIR)/c_flags` '-DMSGQUAL="$*"' -c $< -o $@ val-%: @echo $($(subst val-,,$@))