Honor SORT_DEBUG_KEEP_BUCKETS when swapping in a bucket.

[libucw.git] / build / Makebottom

diff --git a/build/Makebottom b/build/Makebottom
index b15ce14d0c68699dac96a6a8d4218aa7164fda2b..bf342b0cea618849897f0c1bc82a8e8cd829dad8 100644 (file)
--- a/build/Makebottom
+++ b/build/Makebottom
@@ -72,7 +72,7 @@ $(o)/%.pc: $(s)/%.pc $(o)/%.$(LS)
 
 ifdef CONFIG_INSTALL_API
 
 
 ifdef CONFIG_INSTALL_API
 

-API_ROOT:=$(shell cd run && pwd)
+API_ROOT:=$(shell pwd)/run

 INSTALL_RUNDIRS+=include lib/pkgconfig
 api: $(API_INCLUDES) $(addprefix run/lib/pkgconfig/,$(addsuffix .pc,$(API_LIBS)))
 
 INSTALL_RUNDIRS+=include lib/pkgconfig
 api: $(API_INCLUDES) $(addprefix run/lib/pkgconfig/,$(addsuffix .pc,$(API_LIBS)))
 


@@ -80,8 +80,8 @@ $(o)/%/.include-stamp:
        $(Q)$(s)/build/install-includes $(<D) run/include/$(IDST) $(?F)
        $(Q)touch $@
 
        $(Q)$(s)/build/install-includes $(<D) run/include/$(IDST) $(?F)
        $(Q)touch $@
 

-run/lib/pkgconfig/%.pc: $(o)/pkgconfig/%.pc
-       $(M)PC $@
+run/lib/pkgconfig/%.pc:                # RHS supplied in the sub-makefile
+       $(M)PC-API $@

        $(Q)sed <$< >$@ "s@^libdir=.*@libdir=$(API_ROOT)/lib@;s@^incdir=.*@incdir=$(API_ROOT)/include@"
 
 else
        $(Q)sed <$< >$@ "s@^libdir=.*@libdir=$(API_ROOT)/lib@;s@^incdir=.*@incdir=$(API_ROOT)/include@"
 
 else


@@ -90,39 +90,39 @@ endif
 
 # Rules for compiling C
 
 
 # Rules for compiling C
 

-$(o)/%.o: $(s)/%.c $(o)/lib/autoconf.h
+$(o)/%.o: $(s)/%.c $(o)/autoconf.h

        $(M)CC $<
        $(Q)DEPENDENCIES_OUTPUT="$(o)/depend.new $@" $(CC) $(CFLAGS) -c -o $@ $<
 
        $(M)CC $<
        $(Q)DEPENDENCIES_OUTPUT="$(o)/depend.new $@" $(CC) $(CFLAGS) -c -o $@ $<
 

-$(o)/%.o: %.c $(o)/lib/autoconf.h
+$(o)/%.o: %.c $(o)/autoconf.h

        $(M)CC $<
        $(Q)DEPENDENCIES_OUTPUT="$(o)/depend.new $@" $(CC) $(CFLAGS) -c -o $@ $<
 
        $(M)CC $<
        $(Q)DEPENDENCIES_OUTPUT="$(o)/depend.new $@" $(CC) $(CFLAGS) -c -o $@ $<
 

-%.o: %.c $(o)/lib/autoconf.h
+%.o: %.c $(o)/autoconf.h

        $(M)CC $<
        $(Q)DEPENDENCIES_OUTPUT="$(o)/depend.new $@" $(CC) $(CFLAGS) -c -o $@ $<
 
        $(M)CC $<
        $(Q)DEPENDENCIES_OUTPUT="$(o)/depend.new $@" $(CC) $(CFLAGS) -c -o $@ $<
 

-$(o)/%.oo: $(s)/%.c $(o)/lib/autoconf.h
+$(o)/%.oo: $(s)/%.c $(o)/autoconf.h

        $(M)CC-SO $<
        $(Q)DEPENDENCIES_OUTPUT="$(o)/depend.new $@" $(CC) $(CFLAGS) $(CSHARED) -c -o $@ $<
 
        $(M)CC-SO $<
        $(Q)DEPENDENCIES_OUTPUT="$(o)/depend.new $@" $(CC) $(CFLAGS) $(CSHARED) -c -o $@ $<
 

-$(o)/%.oo: %.c $(o)/lib/autoconf.h
+$(o)/%.oo: %.c $(o)/autoconf.h

        $(M)CC-SO $<
        $(Q)DEPENDENCIES_OUTPUT="$(o)/depend.new $@" $(CC) $(CFLAGS) $(CSHARED) -c -o $@ $<
 
        $(M)CC-SO $<
        $(Q)DEPENDENCIES_OUTPUT="$(o)/depend.new $@" $(CC) $(CFLAGS) $(CSHARED) -c -o $@ $<
 

-%.oo: %.c $(o)/lib/autoconf.h
+%.oo: %.c $(o)/autoconf.h

        $(M)CC-SO $<
        $(Q)DEPENDENCIES_OUTPUT="$(o)/depend.new $@" $(CC) $(CFLAGS) $(CSHARED) -c -o $@ $<
 
        $(M)CC-SO $<
        $(Q)DEPENDENCIES_OUTPUT="$(o)/depend.new $@" $(CC) $(CFLAGS) $(CSHARED) -c -o $@ $<
 

-$(o)/%-tt.o: $(s)/%.c $(o)/lib/autoconf.h
+$(o)/%-tt.o: $(s)/%.c $(o)/autoconf.h

        $(M)CC-TEST $<
        $(Q)DEPENDENCIES_OUTPUT="$(o)/depend.new $@" $(CC) $(CFLAGS) -DTEST -c -o $@ $<
 
 # Rules for testing
 
        $(M)CC-TEST $<
        $(Q)DEPENDENCIES_OUTPUT="$(o)/depend.new $@" $(CC) $(CFLAGS) -DTEST -c -o $@ $<
 
 # Rules for testing
 

-$(o)/%-t: $(o)/%-tt.o $(LIBSH)
+$(o)/%-t: $(o)/%-tt.o $(TESTING_DEPS)

        $(M)LD-TEST $@
        $(M)LD-TEST $@

-       $(Q)$(CC) $(LDFLAGS) -o $@ $^ $(shell $(s)/build/lib-flags $^) $(LIBS)
+       $(Q)$(CC) $(LDFLAGS) -o $@ $(shell $(s)/build/lib-flags $^) $(LIBS)

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


@@ -161,15 +161,17 @@ $(o)/%: %.pl $(o)/config.mk $(s)/build/genconf
        $(Q)chmod +x $@
        $(Q)$(call symlink,$@,run/$(BINDIR))
 
        $(Q)chmod +x $@
        $(Q)$(call symlink,$@,run/$(BINDIR))
 

+PERL_MODULE_DIR=UCW
+

 $(o)/%.pm: $(s)/%.pm
 $(o)/%.pm: $(s)/%.pm

-       $(M)PM $<
+       $(M)"PM $< -> run/lib/perl5/$(PERL_MODULE_DIR)/$(@F)"

        $(Q)cp $^ $@
        $(Q)cp $^ $@

-       $(Q)$(call symlink,$@,run/lib/perl5/Sherlock)
+       $(Q)$(call symlink,$@,run/lib/perl5/$(PERL_MODULE_DIR))

 
 $(o)/%.pm: %.pm
 
 $(o)/%.pm: %.pm

-       $(M)PM $<
+       $(M)"PM $< -> run/lib/perl/$(PERL_MODULE_DIR)/$(@F)"

        $(Q)cp $^ $@
        $(Q)cp $^ $@

-       $(Q)$(call symlink,$@,run/lib/perl5/Sherlock)
+       $(Q)$(call symlink,$@,run/lib/perl5/$(PERL_MODULE_DIR))

 
 # Rules for data files
 
 
 # Rules for data files