X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugin_config;h=5615a62efbd49413e26dc35f8f71e97a35927ea6;hb=5c3e5d5e76c29b49708b4e42d194402150b508ab;hp=033476beb0594714c5d5820cffa41ce2f5de220d;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/plugin_config b/cinelerra-5.1/plugin_config
index 033476be..5615a62e 100644
--- a/cinelerra-5.1/plugin_config
+++ b/cinelerra-5.1/plugin_config
@@ -1,17 +1,14 @@
-include $(TOPDIR)/plugin_defs
 
-CFLAGS += -I../ -I$(TOPDIR)/cinelerra \
-	-I$(TOPDIR)/guicast \
-	-I$(TOPDIR)/quicktime \
-	-I../colors \
-	-fPIC \
+CFLAGS += -I../ -I$(CINELERRA) -I$(GUICAST) -I../colors -fPIC
 
-include $(TOPDIR)/thirdparty/config.mak
-CFLAGS += $(static_includes)
-LFLAGS += $(static_libraries)
+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
@@ -21,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))
 
@@ -48,8 +45,7 @@ $(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)