X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=build%2FMakebottom;h=36f731870c3d093dbf276f532525dc55d10a45f6;hb=2623d85c7a2cfbbfafc9b9b8a4f5e75ab21179f3;hp=35229a6d31be75c178e54a2933b4eea629f101cb;hpb=5885a915fd709d3d1b6559a81145b9fe3aade4d0;p=libucw.git

diff --git a/build/Makebottom b/build/Makebottom
index 35229a6d..36f73187 100644
--- a/build/Makebottom
+++ b/build/Makebottom
@@ -42,7 +42,7 @@ force:
 
 # Rules for configuration files
 
-run/$(CONFIG_DIR)/%: $(s)/$(CONFIG_DIR)/% $(o)/config.mk $(BUILDSYS)/genconf
+run/$(CONFIG_DIR)/%: $(s)/$(CONFIG_SRC_DIR)/% $(o)/config.mk $(BUILDSYS)/genconf
 	$(M)CF $<
 	$(Q)$(BUILDSYS)/genconf $< $@ $(o)/config.mk
 
@@ -66,6 +66,14 @@ endif
 	$(Q)$(CC) $(LSHARED) $(LDFLAGS) -o $@ $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" $(BUILDSYS)/lib-flags $^) $(LIBS)
 	$(Q)$(call symlink-alias,$@,run/$(SO_RUNDIR),$(*F)$(SONAME_INFIX).so$(SONAME_SUFFIX))
 
+# On Darwin, gcc expects shared libraries in *.dylib instead of *.so.
+# Surprisingly, when a program is run, it suffices to have *.so files.
+# We don't want to mess up the whole build system with configurable
+# suffices and we also don't want to incur an overhead on Linux, so we
+# just create symbolic links on Darwin, if requested.
+%.dylib: %.so
+	cd $(dir $<) && ln -fs $(notdir $<) $(notdir $@)
+
 $(o)/%.pc: $(s)/%.pc $(o)/%.$(LS)
 	$(M)PC $<
 	$(Q)DEPS="$(shell $(BUILDSYS)/lib-deps $^)" LIBDIR=$(@D) $(BUILDSYS)/genconf $< $@ $(o)/config.mk
@@ -140,6 +148,8 @@ $(o)/%.test: $(s)/%.t $(BUILDSYS)/tester
 	$(M)TEST $@
 	$(Q)$(BUILDSYS)/tester --rundir=run $(TESTERFLAGS) $< && touch $@
 
+.NOTPARALLEL: $(o)/%.test
+
 # Rules for binaries
 
 BINDIR=bin