xtypes&tableprinter: fix of tests of parsing

[libucw.git] / build / Makebottom

diff --git a/build/Makebottom b/build/Makebottom
index 5da3b4017e555093c2ea505563525d45bb37a589..7ada9532c044e65957214809cf660050d15bb62c 100644 (file)
--- a/build/Makebottom
+++ b/build/Makebottom
@@ -42,7 +42,7 @@ force:
 
 # Rules for configuration files
 
 
 # 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
 
        $(M)CF $<
        $(Q)$(BUILDSYS)/genconf $< $@ $(o)/config.mk
 


@@ -63,8 +63,9 @@ endif
 
 %.so:
        $(M)LD $@
 
 %.so:
        $(M)LD $@

-       $(Q)$(CC) $(LSHARED) $(LDFLAGS) -o $@ $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" $(BUILDSYS)/lib-flags $^) $(LIBS)
+       $(Q)$(CC) $(LSHARED) $(LDFLAGS) -o $@ $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" PKG_CONFIG_OPTS="$(PKG_CONFIG_OPTS)" $(BUILDSYS)/lib-flags $^) $(LIBS)

        $(Q)$(call symlink-alias,$@,run/$(SO_RUNDIR),$(*F)$(SONAME_INFIX).so$(SONAME_SUFFIX))
        $(Q)$(call symlink-alias,$@,run/$(SO_RUNDIR),$(*F)$(SONAME_INFIX).so$(SONAME_SUFFIX))

+       $(Q)ln -fs $(*F)$(SONAME_INFIX).so$(SONAME_SUFFIX) run/$(SO_RUNDIR)/$(*F)$(SONAME_INFIX).so

 
 # On Darwin, gcc expects shared libraries in *.dylib instead of *.so.
 # Surprisingly, when a program is run, it suffices to have *.so files.
 
 # On Darwin, gcc expects shared libraries in *.dylib instead of *.so.
 # Surprisingly, when a program is run, it suffices to have *.so files.


@@ -74,7 +75,7 @@ endif
 %.dylib: %.so
        cd $(dir $<) && ln -fs $(notdir $<) $(notdir $@)
 
 %.dylib: %.so
        cd $(dir $<) && ln -fs $(notdir $<) $(notdir $@)
 

-$(o)/%.pc: $(s)/%.pc $(o)/%.$(LS)
+$(o)/%.pc: $(s)/%.pc $(o)/%$(LV).$(LS)

        $(M)PC $<
        $(Q)DEPS="$(shell $(BUILDSYS)/lib-deps $^)" LIBDIR=$(@D) $(BUILDSYS)/genconf $< $@ $(o)/config.mk
        $(Q)mkdir -p $(o)/pkgconfig
        $(M)PC $<
        $(Q)DEPS="$(shell $(BUILDSYS)/lib-deps $^)" LIBDIR=$(@D) $(BUILDSYS)/genconf $< $@ $(o)/config.mk
        $(Q)mkdir -p $(o)/pkgconfig


@@ -142,7 +143,7 @@ $(o)/%-tt.o: $(s)/%.c $(o)/autoconf.h
 
 $(o)/%-t: $(o)/%-tt.o $(TESTING_DEPS)
        $(M)LD-TEST $@
 
 $(o)/%-t: $(o)/%-tt.o $(TESTING_DEPS)
        $(M)LD-TEST $@

-       $(Q)$(CC) $(LDFLAGS) -o $@ $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" $(BUILDSYS)/lib-flags $^) $(LIBS)
+       $(Q)$(CC) $(LDFLAGS) -o $@ $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" PKG_CONFIG_OPTS="$(PKG_CONFIG_OPTS)" $(BUILDSYS)/lib-flags $^) $(LIBS)

 
 $(o)/%.test: $(s)/%.t $(BUILDSYS)/tester
        $(M)TEST $@
 
 $(o)/%.test: $(s)/%.t $(BUILDSYS)/tester
        $(M)TEST $@


@@ -154,7 +155,7 @@ BINDIR=bin
 
 $(o)/%: $(o)/%.o
        $(M)LD $@
 
 $(o)/%: $(o)/%.o
        $(M)LD $@

-       $(Q)$(CC) $(LDFLAGS) -o $@ $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" $(BUILDSYS)/lib-flags $^) $(LIBS)
+       $(Q)$(CC) $(LDFLAGS) -o $@ $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" PKG_CONFIG_OPTS="$(PKG_CONFIG_OPTS)" $(BUILDSYS)/lib-flags $^) $(LIBS)

        $(Q)$(call symlink,$@,run/$(BINDIR))
 
 $(o)/%: $(s)/%.sh $(o)/config.mk $(BUILDSYS)/genconf
        $(Q)$(call symlink,$@,run/$(BINDIR))
 
 $(o)/%: $(s)/%.sh $(o)/config.mk $(BUILDSYS)/genconf