diff Makefile @ 20:68b8b32a2070

* Add virtual destructors to PluginBase and Plugin to ensure subclass dtors
  get called
* Fix buglet in host that caused plugin soname to be used as plugin name if
  no plugin name provided on command line
* Add header dependencies to Makefile

--- a/Makefile	Wed Apr 12 09:57:07 2006 +0000
+++ b/Makefile	Wed Apr 12 12:32:18 2006 +0000
@@ -40,6 +40,16 @@
 
 ### End of user-serviceable parts
 
+API_HEADERS	= \
+		$(APIDIR)/vamp.h
+
+SDK_HEADERS	= \
+		$(SDKDIR)/Plugin.h \
+		$(SDKDIR)/PluginAdapter.h \
+		$(SDKDIR)/PluginBase.h \
+		$(SDKDIR)/PluginHostAdapter.h \
+		$(SDKDIR)/RealTime.h
+
 SDK_OBJECTS	= \
 		$(SDKDIR)/PluginAdapter.o \
 		$(SDKDIR)/PluginHostAdapter.o \
@@ -48,14 +58,21 @@
 SDK_TARGET	= \
 		$(SDKDIR)/libvamp-sdk.a
 
+PLUGIN_HEADERS	= \
+		$(EXAMPLEDIR)/SpectralCentroid.h \
+		$(EXAMPLEDIR)/ZeroCrossing.h
+
 PLUGIN_OBJECTS	= \
+		$(EXAMPLEDIR)/SpectralCentroid.o \
 		$(EXAMPLEDIR)/ZeroCrossing.o \
-		$(EXAMPLEDIR)/SpectralCentroid.o \
 		$(EXAMPLEDIR)/plugins.o
 
 PLUGIN_TARGET	= \
 		$(EXAMPLEDIR)/plugins$(PLUGIN_EXT)
 
+HOST_HEADERS	= \
+		$(HOSTDIR)/system.h
+
 HOST_OBJECTS	= \
 		$(HOSTDIR)/simplehost.o
 
@@ -64,14 +81,14 @@
 
 all:		$(SDK_TARGET) $(PLUGIN_TARGET) $(HOST_TARGET) test
 
-$(SDK_TARGET):	$(SDK_OBJECTS)
-		$(AR) r $@ $^
+$(SDK_TARGET):	$(SDK_OBJECTS) $(API_HEADERS) $(SDK_HEADERS)
+		$(AR) r $@ $(SDK_OBJECTS)
 
-$(PLUGIN_TARGET):	$(PLUGIN_OBJECTS) $(SDK_TARGET)
-		$(CXX) $(LDFLAGS) $(PLUGIN_LDFLAGS) -o $@ $^ $(PLUGIN_LIBS)
+$(PLUGIN_TARGET):	$(PLUGIN_OBJECTS) $(SDK_TARGET) $(PLUGIN_HEADERS)
+		$(CXX) $(LDFLAGS) $(PLUGIN_LDFLAGS) -o $@ $(PLUGIN_OBJECTS) $(PLUGIN_LIBS)
 
-$(HOST_TARGET):	$(HOST_OBJECTS) $(SDK_TARGET)
-		$(CXX) $(LDFLAGS) $(HOST_LDFLAGS) -o $@ $^ $(HOST_LIBS)
+$(HOST_TARGET):	$(HOST_OBJECTS) $(SDK_TARGET) $(HOST_HEADERS)
+		$(CXX) $(LDFLAGS) $(HOST_LDFLAGS) -o $@ $(HOST_OBJECTS) $(HOST_LIBS)
 
 test:		$(HOST_TARGET) $(PLUGIN_TARGET)
 		$(HOST_TARGET) $(PLUGIN_TARGET)