--- freem/src/Makefile.am	2025/03/30 01:36:58	1.6
+++ freem/src/Makefile.am	2025/05/17 17:00:05	1.18
@@ -1,5 +1,5 @@
 #
-#   $Id: Makefile.am,v 1.6 2025/03/30 01:36:58 snw Exp $
+#   $Id: Makefile.am,v 1.18 2025/05/17 17:00:05 snw Exp $
 #    automake rules for main body of FreeM source code
 #
 #  
@@ -24,6 +24,42 @@
 #   along with FreeM.  If not, see <https://www.gnu.org/licenses/>.
 #
 #   $Log: Makefile.am,v $
+#   Revision 1.18  2025/05/17 17:00:05  snw
+#   Make it possible to select the modernized global handler with the configure script and update documentation and README.md
+#
+#   Revision 1.17  2025/05/14 15:30:07  snw
+#   Return build configuration to default
+#
+#   Revision 1.16  2025/05/12 14:26:15  snw
+#   Revert bad change in shared memory manager
+#
+#   Revision 1.15  2025/04/13 04:33:35  snw
+#   Remove -Wall -Wextra -pedantic -D_FORTIFY_SOURCE=1
+#
+#   Revision 1.14  2025/04/13 04:22:43  snw
+#   Fix snprintf calls
+#
+#   Revision 1.13  2025/04/12 00:54:17  snw
+#   Set -fno-stack-protector and -fno-mudflap where available, and set _FORTIFY_SOURCE to 0 everywhere
+#
+#   Revision 1.12  2025/04/12 00:42:07  snw
+#   Remove -Wall and all supporting directives
+#
+#   Revision 1.11  2025/04/09 19:52:02  snw
+#   Eliminate as many warnings as possible while building with -Wall
+#
+#   Revision 1.10  2025/04/09 15:30:03  snw
+#   Check which platform builds fail with -Wall -pedantic
+#
+#   Revision 1.9  2025/04/08 14:45:33  snw
+#   Add global_bltin.h to src/Makefile.am
+#
+#   Revision 1.8  2025/04/02 02:22:49  snw
+#   Remove -Wformat-truncation
+#
+#   Revision 1.7  2025/03/31 16:33:56  snw
+#   Work on fmadm edit global
+#
 #   Revision 1.6  2025/03/30 01:36:58  snw
 #   Make it easier to bring back fma_gedit, fix double-free in global handler, limit $CHAR to 7-bit ASCII
 #
@@ -36,20 +72,20 @@
 #
 
 AM_CFLAGS = -fsigned-char
-AM_CPPFLAGS = -DHACK_NOXLATE -DSYSCONFDIR=\"${sysconfdir}\" -DPREFIX=\"${prefix}\" -DDATADIR=\"${datadir}\" -DLOCALSTATEDIR=\"${localstatedir}\" -DHOST=\"${host_triplet}\"
+AM_CPPFLAGS = -DHACK_NOXLATE -D_FORTIFY_SOURCE=0 -DSYSCONFDIR=\"${sysconfdir}\" -DPREFIX=\"${prefix}\" -DDATADIR=\"${datadir}\" -DLOCALSTATEDIR=\"${localstatedir}\" -DHOST=\"${host_triplet}\"
 
 freem_headers = config.h errmsg.h events.h fmadm.h fma_globals.h fma_jobs.h \
                 fma_journals.h fma_locks.h fma_routines.h freem.h iftab.h iniconf.h \
                 init.h io_socket.h jnldefs.h journal.h libfill.h log.h mdebug.h \
                 merge.h merr.h mpsdef0.h mpsdef.h mref.h mtok.h namespace.h sighnd.h ssvn_zrpi.h \
 		transact.h version.h consttbl.h mwapi_window.h mwapi_event.h shmmgr.h locktab.h \
-		jobtab.h tp_check.h datatypes.h objects.h mcommand.h routine.h fs.h
+		jobtab.h tp_check.h datatypes.h objects.h mcommand.h routine.h fs.h global_bltin.h
 
 freem_commands = cmd_map.c cmd_unmap.c cmd_then.c cmd_throw.c cmd_const.c cmd_kvalue.c \
 		 cmd_ksubscripts.c cmd_tstart.c cmd_tcommit.c cmd_trollback.c cmd_if.c \
                  cmd_using.c cmd_with.c cmd_write.c cmd_else.c cmd_read.c
 
-freem_common = iniconf.c sighnd.c init.c expr.c global_dispatch.c global_bltin.c mlib.c namespace.c operator.c \
+freem_common = iniconf.c sighnd.c init.c expr.c global_dispatch.c mlib.c namespace.c operator.c \
 				  service.c ssvn.c ssvn_character.c ssvn_device.c ssvn_display.c \
 				  ssvn_event.c ssvn_global.c ssvn_job.c ssvn_library.c ssvn_lock.c ssvn_routine.c \
 				  ssvn_system.c ssvn_window.c ssvn_z.c ssvn_zos.c ssvn_zprocess.c \
@@ -60,8 +96,14 @@ freem_common = iniconf.c sighnd.c init.c
 				  locktab.c jobtab.c tp_check.c datatypes.c objects.c ssvn_object.c \
 				  mcommand.c routine.c fs.c $(freem_commands) $(freem_headers)
 
-#fmadm_common = fmadm.c fma_locks.c fma_journals.c fma_routines.c fma_globals.c fma_jobs.c fma_gedit.c
-fmadm_common = fmadm.c fma_locks.c fma_journals.c fma_routines.c fma_globals.c fma_jobs.c
+fmadm_common = fmadm.c fma_locks.c fma_journals.c fma_routines.c fma_globals.c fma_jobs.c fma_gedit.c
+#fmadm_common = fmadm.c fma_locks.c fma_journals.c fma_routines.c fma_globals.c fma_jobs.c
+
+if USE_NEWGLOBALS
+freem_common += newglobal_bltin.c
+else
+freem_common += global_bltin.c
+endif
 
 bin_PROGRAMS = freem fmadm
 lib_LTLIBRARIES = libfreem.la