comparison skeleton/Makefile.inc @ 380:853640243f3d

Fix a couple of mistakes in the skeleton Makefile.inc
author Chris Cannam
date Fri, 12 Sep 2014 12:19:15 +0100
parents 29a73259f59a
children 2894a1c498d0
comparison
equal deleted inserted replaced
379:28e7aaed3292 380:853640243f3d
39 ## Normally you should not edit anything below this line 39 ## Normally you should not edit anything below this line
40 40
41 SRC_DIR := . 41 SRC_DIR := .
42 42
43 CFLAGS := $(ARCHFLAGS) $(CFLAGS) 43 CFLAGS := $(ARCHFLAGS) $(CFLAGS)
44 CXXFLAGS := $(CFLAGS) -I. -I$(VAMPSDK_DIR) -I$(CQ_DIR) -I$(BQVEC_DIR) -I$(FD_DIR) $(CXXFLAGS) 44 CXXFLAGS := $(CFLAGS) -I. -I$(VAMPSDK_DIR) $(CXXFLAGS)
45 45
46 LDFLAGS := $(ARCHFLAGS) $(LDFLAGS) 46 LDFLAGS := $(ARCHFLAGS) $(LDFLAGS)
47 PLUGIN_LDFLAGS := $(LDFLAGS) $(PLUGIN_LDFLAGS) 47 PLUGIN_LDFLAGS := $(LDFLAGS) $(PLUGIN_LDFLAGS)
48 48
49 # Defaults, overridden from the platform-specific Makefile 49 # Defaults, overridden from the platform-specific Makefile
56 56
57 PLUGIN_OBJECTS := $(PLUGIN_SOURCES:.cpp=.o) 57 PLUGIN_OBJECTS := $(PLUGIN_SOURCES:.cpp=.o)
58 PLUGIN_OBJECTS := $(PLUGIN_OBJECTS:.c=.o) 58 PLUGIN_OBJECTS := $(PLUGIN_OBJECTS:.c=.o)
59 59
60 $(PLUGIN): $(PLUGIN_OBJECTS) 60 $(PLUGIN): $(PLUGIN_OBJECTS)
61 $(CXX) -o $@ $^ $(LDFLAGS) 61 $(CXX) -o $@ $^ $(PLUGIN_LDFLAGS)
62 62
63 $(PLUGIN_OBJECTS): $(PLUGIN_HEADERS) 63 $(PLUGIN_OBJECTS): $(PLUGIN_HEADERS)
64 64
65 clean: 65 clean:
66 rm -f $(OBJECTS) 66 rm -f $(OBJECTS)