Summary: minor, always pass on SXE_DYLD_PATH with pointers to the lwlibdir

Keywords: bldchn

This changeset prepends calls to the undumped or dumped sxe binary with
BATCHENV which holds paths to the newly built lwlib libs.  This fixes
builds that switch from say the athena widget kit to the lucid kit, as
the installed lwlib library will certainly not provide some symbols
needed with the new widget kit.

* lisp/Makefile.am: prepend all calls to sxe with BATCHENV

* modules/Makefile.am: prepend all calls to sxe with BATCHENV

* src/Makefile.am: prepend all calls to sxe with BATCHENV

Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>

diff --git a/lisp/Makefile.am b/lisp/Makefile.am
index a1cdbe1..01e5fda 100644 (file)
--- a/lisp/Makefile.am
+++ b/lisp/Makefile.am
@@ -39,6 +39,8 @@ bldlispdir = $(abs_top_builddir)/lisp
 bldffidir = $(bldlispdir)/ffi
 bldmuledir = $(bldlispdir)/mule
 bldtermdir = $(bldlispdir)/term
+sxelwlibdir = $(top_srcdir)/src/ui/lwlib
+bldlwlibdir = $(top_builddir)/src/ui/lwlib
 
 lispffidir = $(lispdir)/ffi
 lispmuledir = $(lispdir)/mule
@@ -182,8 +184,10 @@ SXEMACS_DMP = $(SXEMACS).dmp
 AALFILE = $(bldlispdir)/auto-autoloads.el
 BITCH = $(SXEMACS) -batch
 SXE_DYLD_PATH = $(bldsrcdir):$(bldsrcdir)/$(LT_OBJDIR):$(bldlwlibdir):$(bldlwlibdir)/$(LT_OBJDIR):$(DESTDIR)$(libdir)
-BITCHENV = DYLD_LIBRARY_PATH=$(SXE_DYLD_PATH):$$DYLD_LIBRARY_PATH:$(DYLD_LIBRARY_PATH) \
+BATCHENV = DYLD_LIBRARY_PATH=$(SXE_DYLD_PATH):$$DYLD_LIBRARY_PATH:$(DYLD_LIBRARY_PATH) \
        LD_LIBRARY_PATH=$(SXE_DYLD_PATH):$$LD_LIBRARY_PATH:$(LD_LIBRARY_PATH) \
+       SHLIB_PATH=$(SXE_DYLD_PATH):$$SHLIB_PATH:$(SHLIB_PATH)
+BITCHENV = $(BATCHENV) \
        EMACSPACKAGEPATH= \
        SOURCE_TREE_ROOT=$(abs_top_srcdir) \
        BUILD_TREE_ROOT=$(abs_top_builddir)
@@ -238,7 +242,7 @@ autoc.stamp: $(SXEMACS) auto.stamp update-elc.stamp
        $(BATCH) -vanilla -no-autoloads \
                -l finder -f finder-compile-keywords
        @echo "Building finder database ...(done)"
-       $(BITCH) -no-autoloads -l config \
+       $(BATCHENV) $(BITCH) -no-autoloads -l config \
                -l bytecomp -f batch-byte-compile $(builtels)
        @touch $@
 @make_endif@

diff --git a/modules/Makefile.am b/modules/Makefile.am
index f78f723..744a6d4 100644 (file)
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -41,6 +41,8 @@ sxesrcdir = $(top_srcdir)/src
 bldsrcdir = $(top_builddir)/src
 sxelispdir = $(abs_top_srcdir)/lisp
 bldlispdir = $(abs_top_builddir)/lisp
+sxelwlibdir = $(top_srcdir)/src/ui/lwlib
+bldlwlibdir = $(top_builddir)/src/ui/lwlib
 
 sitemodule_DATA = 
 
@@ -63,7 +65,14 @@ CLEANFILES = auto-autoloads.el* stage1 stage2
 
 SXEMACS = $(top_builddir)/src/sxemacs
 BITCH = $(SXEMACS) -batch
-BITCHENV = EMACSPACKAGEPATH= SOURCE_TREE_ROOT=$(abs_top_srcdir) BUILD_TREE_ROOT=$(abs_top_builddir)
+SXE_DYLD_PATH = $(bldsrcdir):$(bldsrcdir)/$(LT_OBJDIR):$(bldlwlibdir):$(bldlwlibdir)/$(LT_OBJDIR):$(DESTDIR)$(libdir)
+BATCHENV = DYLD_LIBRARY_PATH=$(SXE_DYLD_PATH):$$DYLD_LIBRARY_PATH:$(DYLD_LIBRARY_PATH) \
+       LD_LIBRARY_PATH=$(SXE_DYLD_PATH):$$LD_LIBRARY_PATH:$(LD_LIBRARY_PATH) \
+       SHLIB_PATH=$(SXE_DYLD_PATH):$$SHLIB_PATH:$(SHLIB_PATH)
+BITCHENV = $(BATCHENV) \
+       EMACSPACKAGEPATH= \
+       SOURCE_TREE_ROOT=$(abs_top_srcdir) \
+       BUILD_TREE_ROOT=$(abs_top_builddir)
 BATCH = $(BITCHENV) $(BITCH)
 PUREBATCH = $(BITCHENV) $(PITCH)
 
@@ -73,7 +82,8 @@ auto-autoloads.el: $(SXEMACS)
 
 SUFFIXES = .el .elc
 .el.elc: $(SXEMACS)
-       $(BATCH) -vanilla -l bytecomp -f batch-byte-compile-one-file-here $<
+       $(BATCHENV) $(BATCH) -vanilla -l bytecomp \
+               -f batch-byte-compile-one-file-here $<
 
 #stage1: all-am
 #      @touch $@

diff --git a/src/Makefile.am b/src/Makefile.am
index 6b8791e..32dc335 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -247,9 +247,10 @@ AALFILE = $(bldlispdir)/auto-autoloads.el
 AALCFILE = $(bldlispdir)/auto-autoloads.elc
 BITCH = $(SXEMACS) -batch
 SXE_DYLD_PATH = $(bldsrcdir):$(bldsrcdir)/$(LT_OBJDIR):$(bldlwlibdir):$(bldlwlibdir)/$(LT_OBJDIR):$(DESTDIR)$(libdir)
-BITCHENV = DYLD_LIBRARY_PATH=$(SXE_DYLD_PATH):$$DYLD_LIBRARY_PATH:$(DYLD_LIBRARY_PATH) \
+BATCHENV = DYLD_LIBRARY_PATH=$(SXE_DYLD_PATH):$$DYLD_LIBRARY_PATH:$(DYLD_LIBRARY_PATH) \
        LD_LIBRARY_PATH=$(SXE_DYLD_PATH):$$LD_LIBRARY_PATH:$(LD_LIBRARY_PATH) \
-       SHLIB_PATH=$(SXE_DYLD_PATH):$$SHLIB_PATH:$(SHLIB_PATH) \
+       SHLIB_PATH=$(SXE_DYLD_PATH):$$SHLIB_PATH:$(SHLIB_PATH)
+BITCHENV = $(BATCHENV) \
        EMACSDEBUGPATHS=1 EMACSPACKAGEPATH= \
        SOURCE_TREE_ROOT=$(sxe_srcdir) \
        BUILD_TREE_ROOT=$(sxe_blddir)
@@ -339,6 +340,7 @@ sxemacs.dmp: $(SXEMACS) $(archlib_DATA) $(bldlispdir)/update-elc.stamp
                        (cd $(LT_OBJDIR); \
                        $(LN_S) -f ../$@ $@); \
                fi; \
+               $(BITCHENV) \
                SOURCE_TREE_ROOT= BUILD_TREE_ROOT= \
                        $(BITCH) -f list-load-path-shadows; \
        fi