|
 |
b27f3e |
diff --git a/Makefile b/Makefile
|
|
|
b27f3e |
index 72c8bef..26cb6df 100644
|
|
|
b27f3e |
--- a/Makefile
|
|
|
b27f3e |
+++ b/Makefile
|
|
|
b27f3e |
@@ -235,6 +235,11 @@ TARGETS_A = $(filter %.a,$(TARGETS))
|
|
|
b27f3e |
all: config.mk $(filter-out $(WV_EXCLUDES), $(TARGETS))
|
|
|
b27f3e |
|
|
|
b27f3e |
TESTS += wvtestmain
|
|
|
b27f3e |
+TESTS_DEPS = $(LIBWVSTREAMS)
|
|
|
b27f3e |
+ifneq ("$(with_dbus)", "no")
|
|
|
b27f3e |
+ TESTS_DEPS += libwvdbus.so
|
|
|
b27f3e |
+endif
|
|
|
b27f3e |
+$(TESTS): $(TESTS_DEPS)
|
|
|
b27f3e |
|
|
|
b27f3e |
REAL_TESTS = $(filter-out $(TEST_SKIP_OBJS), $(TESTS))
|
|
|
b27f3e |
$(addsuffix .o,$(REAL_TESTS)):
|
|
|
b27f3e |
diff --git a/wvrules.mk b/wvrules.mk
|
|
|
b27f3e |
index 877f700..921c41b 100644
|
|
|
b27f3e |
--- a/wvrules.mk
|
|
|
b27f3e |
+++ b/wvrules.mk
|
|
|
b27f3e |
@@ -158,18 +158,18 @@ endif
|
|
|
b27f3e |
../%.o:; @echo "Object $@ does not exist!"; exit 1
|
|
|
b27f3e |
/%.a:; @echo "Library $@ does not exist!"; exit 1
|
|
|
b27f3e |
|
|
|
b27f3e |
-%.o: %.c; $(call wvcc ,$@,$<,$*)
|
|
|
b27f3e |
-%.fpic.o: %.c; $(call wvcc ,$@,$<,$*,-fPIC)
|
|
|
b27f3e |
-%.o: %.cc; $(call wvcxx,$@,$<,$*)
|
|
|
b27f3e |
-%.fpic.o: %.cc; $(call wvcxx,$@,$<,$*,-fPIC)
|
|
|
b27f3e |
-%.o: %.cpp; $(call wvcxx,$@,$<,$*)
|
|
|
b27f3e |
-%.fpic.o:%.cpp; $(call wvcxx,$@,$<,$*,-fPIC)
|
|
|
b27f3e |
-%.s: %.c; $(call wvcc ,$@,$<,$*,,-S)
|
|
|
b27f3e |
-%.s: %.cc; $(call wvcxx,$@,$<,$*,,-S)
|
|
|
b27f3e |
-%.s: %.cpp; $(call wvcxx,$@,$<,$*,,-S)
|
|
|
b27f3e |
-%.E: %.c; $(call wvcc,$@,$<,$*,,-E)
|
|
|
b27f3e |
-%.E: %.cc; $(call wvcxx,$@,$<,$*,,-E)
|
|
|
b27f3e |
-%.E: %.cpp; $(call wvcxx,$@,$<,$*,,-E)
|
|
|
b27f3e |
+%.o: CC %.c; $(call wvcc ,$@,$<,$*)
|
|
|
b27f3e |
+%.fpic.o: CC %.c; $(call wvcc ,$@,$<,$*,-fPIC)
|
|
|
b27f3e |
+%.o: CXX %.cc; $(call wvcxx,$@,$<,$*)
|
|
|
b27f3e |
+%.fpic.o: CXX %.cc; $(call wvcxx,$@,$<,$*,-fPIC)
|
|
|
b27f3e |
+%.o: CXX %.cpp; $(call wvcxx,$@,$<,$*)
|
|
|
b27f3e |
+%.fpic.o: CXX %.cpp; $(call wvcxx,$@,$<,$*,-fPIC)
|
|
|
b27f3e |
+%.s: CC %.c; $(call wvcc ,$@,$<,$*,,-S)
|
|
|
b27f3e |
+%.s: CXX %.cc; $(call wvcxx,$@,$<,$*,,-S)
|
|
|
b27f3e |
+%.s: CXX %.cpp; $(call wvcxx,$@,$<,$*,,-S)
|
|
|
b27f3e |
+%.E: CC %.c; $(call wvcc,$@,$<,$*,,-E)
|
|
|
b27f3e |
+%.E: CXX %.cc; $(call wvcxx,$@,$<,$*,,-E)
|
|
|
b27f3e |
+%.E: CXX %.cpp; $(call wvcxx,$@,$<,$*,,-E)
|
|
|
b27f3e |
|
|
|
b27f3e |
%.moc: %.h; $(MOC) -o $@ $<
|
|
|
b27f3e |
|