X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2FMakefile.am;h=9806abdfe9a1eb66a311d37568a7dd35f9306275;hb=12591ca7b6251569ff6a8d6c625e57cf089536c4;hp=a1cdbe1f3172c2e238ebb14771abbb77291a2116;hpb=b359d963178f727f70ed74b16a8e99ae8f370f85;p=sxemacs

diff --git a/lisp/Makefile.am b/lisp/Makefile.am
index a1cdbe1..9806abd 100644
--- a/lisp/Makefile.am
+++ b/lisp/Makefile.am
@@ -15,7 +15,7 @@
 ## General Public License for more details.
 
 ## You should have received a copy of the GNU General Public License
-## along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ## Process this file with automake to produce Makefile.in
 
@@ -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
@@ -54,14 +56,13 @@ ETAGS = $(top_builddir)/lib-src/etags
 TAGS_DEPENDENCIES = $(ETAGS)
 ETAGS_ARGS =
 
-sxepkg_DATA = 
-xepkg_DATA = 
-mulepkg_DATA = 
-sitepkg_DATA = 
+sxepkg_DATA =
+xepkg_DATA =
+mulepkg_DATA =
+sitepkg_DATA =
 
 subdirs = ffi mule term
 
-EXTRA_DIST = ffi/Makefile.in mule/Makefile.in
 nocompile_bldchainels =							\
 	build-autoloads.el compile-core.el loadup-el.el loadup.el       \
 	site-load.el update-elc.el update-elc-2.el very-early-lisp.el
@@ -73,41 +74,35 @@ corelispels =								\
 	abbrev.el about.el alist.el apropos.el auto-save.el		\
 	auto-show.el backquote.el blessmail.el buff-menu.el buffer.el	\
 	build-rpt.el byte-optimize.el bytecomp-runtime.el bytecomp.el	\
-	callers-of-rpt.el cl-compat.el cl-extra.el              	\
-	cl-macs.el cl-seq.el cl.el cmdloop.el code-cmds.el		\
-	code-files.el code-process.el coding.el compat.el config.el	\
-	console.el cus-dep.el cus-edit.el cus-face.el cus-file.el	\
-	cus-load.el cus-start.el custom.el derived.el device.el		\
-	dialog-gtk.el dialog-items.el dialog.el disass.el		\
-	disp-table.el dragdrop.el easy-mmode.el easymenu.el 		\
-	emod-utils.el etags.el events.el extents.el faces.el ffi.el 	\
-	files-nomule.el files.el fill.el float-sup.el font-lock.el 	\
-	font-menu.el font.el fontl-hooks.el format.el frame.el gdk.el   \
-	generic-widgets.el glade.el glyphs.el gnome-widgets.el gnome.el \
-	gnuserv.el gpm.el gtk-compose.el gtk-extra.el gtk-faces.el 	\
-	gtk-ffi.el gtk-file-dialog.el gtk-font-menu.el gtk-glyphs.el 	\
-	gtk-init.el gtk-iso8859-1.el gtk-marshal.el gtk-mouse.el 	\
-	gtk-package.el gtk-password-dialog.el gtk-select.el 		\
-	gtk-widget-accessors.el	gtk-widgets.el gtk.el gui.el 		\
-	gutter-items.el gutter.el help-macro.el help-nomule.el help.el  \
-	hyper-apropos.el indent.el info.el isearch-mode.el iso8859-1.el \
-	issue-tracker.el itimer-autosave.el itimer.el keydefs.el 	\
-	keymap.el ldap.el lib-complete.el lisp-initd.el lisp-mnt.el 	\
-	lisp-mode.el lisp.el list-mode.el loaddefs.el loadhist.el 	\
-	map-ynp.el menubar-items.el menubar.el minibuf.el misc.el 	\
-	mode-motion.el modeline.el mouse.el movemail.el multicast.el 	\
-	mwheel.el number.el objects.el obsolete.el package-admin.el	\
+	callers-of-rpt.el cl-compat.el cl-extra.el cl-macs.el cl-seq.el \
+	cl.el cmdloop.el code-cmds.el code-files.el code-process.el	\
+	coding.el compat.el config.el console.el const-aliases.el	\
+	cus-dep.el cus-edit.el cus-face.el cus-file.el cus-load.el	\
+	cus-start.el custom.el derived.el device.el dialog-items.el	\
+	dialog.el disass.el disp-table.el dragdrop.el easy-mmode.el	\
+	easymenu.el emod-utils.el etags.el events.el extents.el		\
+	faces.el ffi.el files-nomule.el files.el fill.el float-sup.el	\
+	font-lock.el font-menu.el font.el fontl-hooks.el format.el	\
+	frame.el glyphs.el gnuserv.el gpm.el gui.el gutter-items.el	\
+	gutter.el help-macro.el help-nomule.el help.el hyper-apropos.el \
+	indent.el info.el isearch-mode.el iso8859-1.el issue-tracker.el	\
+	itimer-autosave.el itimer.el keydefs.el keymap.el ldap.el	\
+	lib-complete.el lisp-initd.el lisp-mnt.el lisp-mode.el lisp.el	\
+	list-mode.el loaddefs.el loadhist.el map-ynp.el			\
+	menubar-items.el menubar.el minibuf.el misc.el mode-motion.el	\
+	modeline.el mouse.el movemail.el multicast.el mwheel.el		\
+	number.el objects.el obsolete.el package-admin.el		\
 	package-get.el package-info.el package-ui.el packages.el	\
 	page.el paragraphs.el paths.el picture.el printer.el		\
 	process.el rect.el regexp-opt.el register.el replace.el         \
 	resize-minibuffer.el scrollbar.el select.el shadow.el simple.el \
 	sound.el specifier.el subr.el symbol-syntax.el symbols.el       \
-	syntax.el text-mode.el text-props.el toolbar-items.el           \
-	toolbar.el tty-init.el undo-stack.el userlock.el version.el     \
-	view-less.el wid-browse.el wid-edit.el widget.el widgets-gtk.el	\
-	window-xemacs.el window.el x-color.el x-compose.el x-faces.el	\
-	x-font-menu.el x-init.el x-iso8859-1.el x-misc.el x-mouse.el	\
-	x-scrollbar.el x-select.el x-win-sun.el x-win-xfree86.el
+        syntax.el text-mode.el text-props.el toolbar-items.el           \
+        toolbar.el tty-init.el undo-stack.el userlock.el version.el     \
+        view-less.el wid-browse.el wid-edit.el widget.el                \
+        window-xemacs.el window.el x-color.el x-compose.el x-faces.el   \
+        x-font-menu.el x-init.el x-iso8859-1.el x-misc.el x-mouse.el    \
+        x-scrollbar.el x-select.el x-win-sun.el x-win-xfree86.el
 
 ffilispels =								\
 	ffi/ffi-curl.el ffi/ffi-gcrypt.el ffi/ffi-libc.el		\
@@ -118,7 +113,7 @@ mulelispels =								\
 	mule/cyrillic.el mule/english.el mule/ethiopic.el		\
 	mule/european.el mule/greek.el mule/hebrew.el mule/japanese.el	\
 	mule/kinsoku.el mule/korean.el mule/latin.el mule/misc-lang.el	\
-	mule/mule-category.el mule/ccl.el mule/mule-charset.el  	\
+	mule/mule-category.el mule/ccl.el mule/mule-charset.el	\
 	mule/mule-cmds.el mule/mule-coding.el mule/mule-help.el		\
 	mule/mule-init.el mule/mule-misc.el mule/mule-tty-init.el	\
 	mule/mule-x-init.el mule/thai-xtis-chars.el mule/thai-xtis.el	\
@@ -136,15 +131,15 @@ termlispels =								\
 
 builtels =                                                              \
 	auto-autoloads.el custom-load.el finder-inf.el                  \
-	custom-defines.el 
+	custom-defines.el
 
 ffibuiltels =                                                           \
-        ffi/auto-autoloads.el ffi/custom-load.el                        \
-        ffi/custom-defines.el
+	ffi/auto-autoloads.el ffi/custom-load.el                        \
+	ffi/custom-defines.el
 
 mulebuiltels =                                                          \
-        mule/auto-autoloads.el mule/custom-load.el                      \
-        mule/custom-defines.el
+	mule/auto-autoloads.el mule/custom-load.el                      \
+	mule/custom-defines.el
 
 
 if HAVE_FFI
@@ -154,7 +149,7 @@ if WITH_MULE
 builtels += $(mulebuiltels)
 endif
 
-nocompile_elfiles = 
+nocompile_elfiles =
 compile_elfiles = $(compile_bldchainels) $(corelispels) $(termlispels)
 if HAVE_FFI
 compile_elfiles += $(ffilispels)
@@ -168,6 +163,8 @@ nobase_dist_lisp_DATA = $(elfiles)
 nobase_lisp_DATA = $(builtels) $(elfiles:.el=.elc) $(builtels:.el=.elc)
 noinst_DATA = auto.stamp update-elc.stamp autoc.stamp
 
+EXTRA_DIST = $(nocompile_bldchainels) $(compile_bldchainels)
+
 BUILT_FILES = auto.stamp update-elc.stamp autoc.stamp
 
 CLEANFILES = core* stage1 stage2 $(builtels) $(builtels:.el=.elc)	\
@@ -182,8 +179,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 +237,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@
@@ -266,3 +265,5 @@ auto.stamp: $(SXEMACS) $(compile_elfiles)
 #	@touch $@
 #
 #all: stage1 stage2
+
+.NOTPARALLEL: