Merge remote-tracking branch 'origin/master' into for-steve

[sxemacs] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 602c110..7d8c622 100644 (file)
--- 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,33 +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_LIBSXEUIGTK
-pdumplibs += $(builddir)/ui/Gtk/libsxeuiGtk.a 
-# sxe_subdirs += ui
-endif
-
 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
 
@@ -149,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
@@ -183,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)
@@ -217,13 +210,12 @@ 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)
 EXTRA_libsxecore_a_SOURCES = dumper.c realpath.c
-libsxecore_a_CPPFLAGS = $(AM_CPPFLAGS) 
+libsxecore_a_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS)
 libsxecore_a_LIBADD = $(libsxecore_objs)
 libsxecore_a_DEPENDENCIES = $(libsxecore_a_LIBADD)
 all_sources += $(libsxecore_a_sources) $(libsxecore_objs:.o=.c)
@@ -234,8 +226,8 @@ li