X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fplugin_config;h=4c54088f0b8b1dd42fb8672efc2ee1f366a0f7f0;hb=a0cf574cd7814600dc5730b8204b51cb91f8ad12;hp=9957c107188f78babbd572ffc030544104e7d191;hpb=7a70932d3e04454177c456d0b42ee2f5318d6ad1;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/plugin_config b/cinelerra-5.1/plugin_config
index 9957c107..4c54088f 100644
--- a/cinelerra-5.1/plugin_config
+++ b/cinelerra-5.1/plugin_config
@@ -1,20 +1,14 @@
-TOPDIR ?= $(CURDIR)/..
-export TOPDIR
-include $(TOPDIR)/global_config
 
-CFLAGS += -I../ -I$(TOPDIR)/cinelerra \
-	-I$(TOPDIR)/guicast \
-	-I$(TOPDIR)/quicktime \
-	-I../colors \
-	-fPIC \
+CFLAGS += -I../ -I$(CINELERRA) -I$(GUICAST) -I../colors -fPIC
 
 CFLAGS += $(static_incs)
 LFLAGS += $(static_libs)
 LDLINKER ?= g++ -shared
 $(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
@@ -24,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))