X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=src%2FMakefile.am;h=5e22ac3d349266eddcb1b6f88465be0fca2df986;hb=f7e5f0c2935452194ac6bceb527cc329f7f230f8;hp=3c2b36a433fa0e1261f88a5324a75835a4a99b26;hpb=a2f777bd44b2f19f02cc9fcb5e1bb40fe8c90be6;p=sxemacs

diff --git a/src/Makefile.am b/src/Makefile.am
index 3c2b36a..5e22ac3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -58,10 +58,10 @@ ETAGS = $(top_builddir)/lib-src/etags
 TAGS_DEPENDENCIES = $(ETAGS)
 
 bin_PROGRAMS = sxemacs
-bin_SCRIPTS = sxemacs.dmp
+noinst_DATA = sxemacs.dmp
 archlib_DATA = config.values DOC
 
-pdumplibs = 
+pdumplibs =
 noinst_pdumplibs=
 nodumplibs=
 noinst_nodumplibs=
@@ -70,28 +70,28 @@ pdump_ldadd =
 SUBDIRS=
 sxe_subdirs=
 
-pdumplibs        += libsxecore.a 
-noinst_pdumplibs += libsxecore.a 
-pdump_ldadd      += $(libsxecore_a_ldflags) 
+pdumplibs        += libsxecore.a
+noinst_pdumplibs += libsxecore.a
+pdump_ldadd      += $(libsxecore_a_ldflags)
 
 # Inverse order of dependency for order dependendant
 # linkers...
 
 if NEED_LIBSXEUIX11
-pdumplibs += $(builddir)/ui/X11/libsxeuiX11.a 
+pdumplibs += $(builddir)/ui/X11/libsxeuiX11.a
 # sxe_subdirs += ui
 endif
 
 if NEED_LIBSXEUITTY
-pdumplibs += $(builddir)/ui/TTY/libsxeuiTTY.a 
+pdumplibs += $(builddir)/ui/TTY/libsxeuiTTY.a
 # sxe_subdirs += ui
 endif
 
-pdumplibs += $(builddir)/ui/libsxeui.a 
+pdumplibs += $(builddir)/ui/libsxeui.a
 # pdump_ldadd +=
 sxe_subdirs += ui
 
-pdumplibs += $(builddir)/events/libsxeevents.a 
+pdumplibs += $(builddir)/events/libsxeevents.a
 # pdump_ldadd +=
 sxe_subdirs += events
 
@@ -144,28 +144,26 @@ noinst_LIBRARIES = $(noinst_pdumplibs) $(noinst_nodumplibs)
 acgen_headers = config.h sxe-paths.h
 header_HEADERS = $(acgen_headers)		\
 	$(libsxecore_a_headers)			\
-	emodules-ng.h
+	emodules-ng.h				\
+	sxe-utils.h
 
 sheader_HEADERS = $(srcdir)/s/*.h
 mheader_HEADERS = $(srcdir)/m/*.h
 
-BUILT_SOURCES = sheap-adjust.h dump-id.c
-EXTRA_DIST = sheap-adjust.h
+BUILT_SOURCES = dump-id.c
+EXTRA_DIST =
 CLEANFILES = core* stage1 stage2 *.stamp $(BUILT_SOURCES) \
 	sxemacs.dmp DOC config.values
 
 ## binaries
 sxemacs_SOURCES = $(header_HEADERS)
 ##$(LOCK_OBJ) $(RTC_patch_objs)
-EXTRA_sxemacs_SOURCES = lastfile.c profile.c sheap.c pre-crt0.c ecrt0.c
+EXTRA_sxemacs_SOURCES = lastfile.c profile.c pre-crt0.c ecrt0.c
 sxemacs_CPPFLAGS = $(AM_CPPFLAGS)
 sxemacs_lddep = $(start_files) $(pdumplibs) $(nodumplibs)
 if WITH_PDUMP
 sxemacs_lddep += dump-id.o
 endif
-if BUILD_SHEAP
-sxemacs_lddep += sheap.o
-endif
 if HAVE_SETITIMER
 sxemacs_lddep += profile.o
 endif
@@ -178,9 +176,9 @@ sxemacs_LDFLAGS = $(AM_LDFLAGS) $(start_flags)
 ## hm, rpath is gross, says njsf
 #sxemacs_LDFLAGS += -Wl,-rpath,$(abs_top_builddir)/lwlib/$(LT_OBJDIR)
 sxemacs_LDADD = $(sxemacs_lddep) $(OPENSSL_LIBS)
-sxemacs_LDADD += $(sxemacs_ldadd) 		\
+sxemacs_LDADD += $(sxemacs_ldadd)		\
 		 $(ld_switch_all) $(ld_libs_all)\
-	 	 $(lib_gcc) $(FFI_LIBS)		\
+		 $(lib_gcc) $(FFI_LIBS)		\
 		 $(LIBLTDL)
 if WITH_BDWGC
 sxemacs_CPPFLAGS += $(BDWGC_CPPFLAGS)
@@ -201,7 +199,7 @@ libsxecore_a_headers =							\
 	process.h							\
 	procimpl.h rangetab.h regex.h semaphore.h seq.h skiplist.h	\
 	specifier.h symeval.h symsinit.h syntax.h syscommctrl.h		\
-	sysdep.h sysdir.h sysfile.h sysproc.h syspwd.h			\
+	sysdep.h sysdir.h sysfile.h sysproc.h syspwd.h sysgrp.h 	\
 	syssignal.h systime.h syswait.h \
 	sxemacs.h
 libsxecore_a_sources =							\
@@ -212,8 +210,7 @@ libsxecore_a_sources =							\
 	dynarr.c editfns.c elhash.c emacs.c eval.c dynacat.c		\
 	extents.c fileio.c filemode.c fns.c general.c hash.c indent.c	\
 	intl.c line-number.c lread.c lstream.c macros.c map.c marker.c	\
-	md5.c								\
-	objects.c opaque.c print.c process.c process-unix.c rangetab.c	\
+	md5.c opaque.c print.c process.c process-unix.c rangetab.c	\
 	regex.c search.c semaphore.c seq.c signal.c skiplist.c		\
 	strftime.c symbols.c syntax.c sysdep.c undo.c
 libsxecore_a_SOURCES = $(libsxecore_a_headers) $(libsxecore_a_sources)
@@ -229,7 +226,7 @@ libcruft_a_SOURCES = $(libcruft_a_headers) $(libcruft_a_sources)
 EXTRA_libcruft_a_SOURCES =						\
 	alloca.c debug.c effi.c emodules-ng.c				\
 	filelock.c getloadavg.c inline.c openssl.c strcat.c tests.c
-libcruft_a_CPPFLAGS = 							\
+libcruft_a_CPPFLAGS =							\
 	$(AM_CPPFLAGS) $(DB_CPPFLAGS) $(FFI_CPPFLAGS) $(X_CFLAGS)
 libcruft_a_LIBADD = $(libcruft_objs)
 libcruft_a_DEPENDENCIES = $(libcruft_a_LIBADD)
@@ -242,7 +239,8 @@ 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)
-BATCHENV = DYLD_LIBRARY_PATH=$(SXE_DYLD_PATH):$$DYLD_LIBRARY_PATH:$(DYLD_LIBRARY_PATH) \
+BATCHENV = $(EXTRA_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) \
@@ -255,12 +253,6 @@ RM = rm -f
 CROSSMAKE = (cd $$(dirname $@) && $(MAKE) $(AM_MAKEFLAGS) $$(basename $@))
 
 
-sheap-adjust.h:
-	@echo "Resetting \`src/sheap-adjust.h'."; \
-	(echo "/*	Do not edit this file!" ; \
-	 echo "  	Automatically generated by SXEmacs */" ; \
-	 echo "#define SHEAP_ADJUSTMENT 0") > $@
-
 dump-id.c: $(bldlibsrcdir)/make-dump-id
 	$(bldlibsrcdir)/make-dump-id
 
@@ -279,9 +271,9 @@ DOC: $(SXEMACS) $(bldlispdir)/auto.stamp
 			-o $(bldsrcdir)/DOC -d $(sxesrcdir) \
 			-i $(sxe_srcdir)/site-packages \
 			$(sxesrcdir)/*.c \
-	                $(sxesrcdir)/*/*.c \
-	                $(sxesrcdir)/*/*/*.c \
-	                $(sxeemoddir)/*/*.c; \
+			$(sxesrcdir)/*/*.c \
+			$(sxesrcdir)/*/*/*.c \
+			$(sxeemoddir)/*/*.c; \
 		touch $@; \
 	fi
 
@@ -319,9 +311,8 @@ config.values: config.h
 ## relinked sxemacs
 ## one day (when SXE is linked with its own shared libraries) we HAVE to
 ## go that way but at the moment it's okay the way it is
-SXEDMP_FILEEXT=dmp
-SXEMACS_FILENAME=sxemacs
-SXEDMP_FILENAME=$(SXEMACS_FILENAME).$(SXEDMP_FILEEXT)
+SXE_SHOW_DUMP = $$($(BITCHENV) $(DESTDIR)$(bindir)/sxemacs -sd)
+SXEDMP_FILENAME=sxemacs.dmp
 
 sxemacs.dmp: $(SXEMACS) $(archlib_DATA) $(bldlispdir)/update-elc.stamp
 	if test -e "$(bldlispdir)/update-elc.stamp"; then \
@@ -337,24 +328,25 @@ sxemacs.dmp: $(SXEMACS) $(archlib_DATA) $(bldlispdir)/update-elc.stamp
 		fi; \
 		$(BATCHENV) \
 		SOURCE_TREE_ROOT= BUILD_TREE_ROOT= \
-			$(BITCH) -f list-load-path-shadows; \
+			$(BITCH) -l shadow -f list-load-path-shadows; \
 	fi
 
 ## alibi targets
 $(bldlispdir)/update-elc.stamp $(bldlispdir)/auto.stamp:
 	:
 
-SXE_SHOW_DUMP = $$($(BITCHENV) $(DESTDIR)$(bindir)/sxemacs -sd)
-
 ## improve me, make me (the dump file) independent from the binary
+## because of historical reasons we also delete $(bindir)/sxemacs.dmp here
 install-exec-hook:
 	(cd $(DESTDIR)$(bindir) && $(RM) sxemacs.dmp)
+	(cd $(DESTDIR)$(archlibdir) && $(RM) sxemacs.dmp)
 	(cd $(abs_builddir); \
 	$(BITCHENV) $(DESTDIR)$(bindir)/sxemacs -nd -batch \
 		-l $(sxelispdir)/loadup.el \
-		--dump $(DESTDIR)$(bindir)/sxemacs-$(old_version)-$(SXE_SHOW_DUMP).dmp)
-	(cd $(DESTDIR)$(bindir) && \
-		$(LN_S) sxemacs-$(old_version)-$(SXE_SHOW_DUMP).dmp sxemacs.dmp)
+		--dump $(DESTDIR)$(archlibdir)/$(SXEDMP_FILENAME))
+
+uninstall-hook:
+	(cd $(DESTDIR)$(archlibdir) && $(RM) $(SXEDMP_FILENAME))
 
 
 ## someone who wants to use this actually needs repeat the fuss above
@@ -375,7 +367,7 @@ sxemacs.dmp.gdb: $(SXEMACS) $(AALFILE) \
 #
 #all: stage1 stage2
 
-# 
+#
 # Help the SXEmacs developers get nice post-processed source files
 
 ## Create preprocessor output (debugging purposes only)