Enable large files support on linux -- mm

diff --git a/hadaq/Makefile.am b/hadaq/Makefile.am
index ad75418e2bd9af59940c46ea43fedce395e90617..0b73b1af4fba231da6047d39c2e7ec9becdafbd9 100644 (file)
--- a/hadaq/Makefile.am
+++ b/hadaq/Makefile.am
@@ -31,6 +31,10 @@ xmanage: daq_xmanage anal
 bin_PROGRAMS = @daq_xmanage_prog@ @daq_manage_prog@ daq_agent daq_readout daq_memnet daq_netmem daq_evtbuild daq_sniff daq_anal daq_ctrlctu
 EXTRA_PROGRAMS = daq_xmanage daq_manage
 
+lib_LIBRARIES = libhadaq.a
+libhadaq_a_SOURCES = worker.c psxshm.c
+include_HEADERS = worker.h psxshm.h
+
 daq_xmanage_SOURCES = tcldaq.c tkAppInit.c \
        agent_clnt.c agent_xdr.c worker.c psxshm.c
 daq_manage_SOURCES = tcldaq.c tclAppInit.c \

diff --git a/hadaq/Makefile.in b/hadaq/Makefile.in
index e69025657b0efe84b4695c39a55ad59be2cb4baa..bde2f68fa255ad764659e1ae9365cbdb3fb2e334 100644 (file)
--- a/hadaq/Makefile.in
+++ b/hadaq/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -77,37 +77,72 @@ BUILT_SOURCES = agent.h online.h
 bin_PROGRAMS = @daq_xmanage_prog@ @daq_manage_prog@ daq_agent daq_readout daq_memnet daq_netmem daq_evtbuild daq_sniff daq_anal daq_ctrlctu
 EXTRA_PROGRAMS = daq_xmanage daq_manage
 
-daq_xmanage_SOURCES = tcldaq.c tkAppInit.c     agent_clnt.c agent_xdr.c worker.c psxshm.c
+lib_LIBRARIES = libhadaq.a
+libhadaq_a_SOURCES = worker.c psxshm.c
+include_HEADERS = worker.h psxshm.h
 
-daq_manage_SOURCES = tcldaq.c tclAppInit.c     agent_clnt.c agent_xdr.c worker.c psxshm.c
+daq_xmanage_SOURCES = tcldaq.c tkAppInit.c \
+       agent_clnt.c agent_xdr.c worker.c psxshm.c
 
-daq_agent_SOURCES = agent.c agent_svc.c agent_xdr.c    worker.c psxshm.c
+daq_manage_SOURCES = tcldaq.c tclAppInit.c \
+       agent_clnt.c agent_xdr.c worker.c psxshm.c
 
-daq_readout_SOURCES = readout.c        worker.c        subevt.c        shmtrans.c hadtuqueue.c                 psxshm.c                hadtu.c
+daq_agent_SOURCES = agent.c agent_svc.c agent_xdr.c \
+       worker.c psxshm.c
+
+daq_readout_SOURCES = readout.c \
+       worker.c \
+       subevt.c \
+       shmtrans.c hadtuqueue.c \
+               psxshm.c \
+               hadtu.c
 
 daq_readout_LDADD = @hw_objects@
 daq_readout_DEPENDENCIES = @hw_objects@
 EXTRA_daq_readout_SOURCES = hwsoft.c hwrich.c hwrace.c rc.c hwmdc.c hwsam.c hwshow.c hwship.c hwtrig.c hwtip.c
-daq_memnet_SOURCES = memnet.c  worker.c        shmtrans.c hadtuqueue.c                 psxshm.c        nettrans.c              hadtu.c
-
-daq_netmem_SOURCES = netmem.c  worker.c        shmtrans.c hadtuqueue.c                 psxshm.c        nettrans.c              hadtu.c
-
-daq_evtbuild_SOURCES = evtbuild.c      worker.c        shmtrans.c hadtuqueue.c                 psxshm.c        online.c online_svc.c online_xdr.c              evt.c subevt.c                  hadtu.c         ansiTape.c ansiTapeLabel.c ansiTapeChar.c
-
-daq_ctrlctu_SOURCES = ctrlctu.c        worker.c psxshm.c
+daq_memnet_SOURCES = memnet.c \
+       worker.c \
+       shmtrans.c hadtuqueue.c \
+               psxshm.c \
+       nettrans.c \
+               hadtu.c
+
+daq_netmem_SOURCES = netmem.c \
+       worker.c \
+       shmtrans.c hadtuqueue.c \
+               psxshm.c \
+       nettrans.c \
+               hadtu.c
+
+daq_evtbuild_SOURCES = evtbuild.c \
+       worker.c \
+       shmtrans.c hadtuqueue.c \
+               psxshm.c \
+       online.c online_svc.c online_xdr.c \
+               evt.c subevt.c \
+                       hadtu.c \
+       ansiTape.c ansiTapeLabel.c ansiTapeChar.c
+
+daq_ctrlctu_SOURCES = ctrlctu.c \
+       worker.c psxshm.c
 
 daq_sniff_SOURCES = sniff.c online_clnt.c online_xdr.c
 daq_anal_SOURCES = showevt.c hldread.c evt.c subevt.c hadtu.c
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_CLEAN_FILES = 
-PROGRAMS =  $(bin_PROGRAMS)
+LIBRARIES =  $(lib_LIBRARIES)
 
 
 DEFS = @DEFS@ -I. -I$(srcdir) 
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
+libhadaq_a_LIBADD = 
+libhadaq_a_OBJECTS =  worker.o psxshm.o
+AR = ar
+PROGRAMS =  $(bin_PROGRAMS)
+
 daq_xmanage_OBJECTS =  tcldaq.o tkAppInit.o agent_clnt.o agent_xdr.o \
 worker.o psxshm.o
 daq_xmanage_LDADD = $(LDADD)
@@ -157,12 +192,14 @@ CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+HEADERS =  $(include_HEADERS)
+
 DIST_COMMON =  Makefile.am Makefile.in aclocal.m4 configure configure.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 DEP_FILES =  .deps/agent.P .deps/agent_clnt.P .deps/agent_svc.P \
 .deps/agent_xdr.P .deps/ansiTape.P .deps/ansiTapeChar.P \
@@ -175,8 +212,8 @@ DEP_FILES =  .deps/agent.P .deps/agent_clnt.P .deps/agent_svc.P \
 .deps/psxshm.P .deps/rc.P .deps/readout.P .deps/shmtrans.P \
 .deps/showevt.P .deps/sniff.P .deps/subevt.P .deps/tclAppInit.P \
 .deps/tcldaq.P .deps/tkAppInit.P .deps/worker.P
-SOURCES = $(daq_xmanage_SOURCES) $(daq_manage_SOURCES) $(daq_agent_SOURCES) $(daq_readout_SOURCES) $(EXTRA_daq_readout_SOURCES) $(daq_memnet_SOURCES) $(daq_netmem_SOURCES) $(daq_evtbuild_SOURCES) $(daq_sniff_SOURCES) $(daq_anal_SOURCES) $(daq_ctrlctu_SOURCES)
-OBJECTS = $(daq_xmanage_OBJECTS) $(daq_manage_OBJECTS) $(daq_agent_OBJECTS) $(daq_readout_OBJECTS) $(daq_memnet_OBJECTS) $(daq_netmem_OBJECTS) $(daq_evtbuild_OBJECTS) $(daq_sniff_OBJECTS) $(daq_anal_OBJECTS) $(daq_ctrlctu_OBJECTS)
+SOURCES = $(libhadaq_a_SOURCES) $(daq_xmanage_SOURCES) $(daq_manage_SOURCES) $(daq_agent_SOURCES) $(daq_readout_SOURCES) $(EXTRA_daq_readout_SOURCES) $(daq_memnet_SOURCES) $(daq_netmem_SOURCES) $(daq_evtbuild_SOURCES) $(daq_sniff_SOURCES) $(daq_anal_SOURCES) $(daq_ctrlctu_SOURCES)
+OBJECTS = $(libhadaq_a_OBJECTS) $(daq_xmanage_OBJECTS) $(daq_manage_OBJECTS) $(daq_agent_OBJECTS) $(daq_readout_OBJECTS) $(daq_memnet_OBJECTS) $(daq_netmem_OBJECTS) $(daq_evtbuild_OBJECTS) $(daq_sniff_OBJECTS) $(daq_anal_OBJECTS) $(daq_ctrlctu_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -196,29 +233,36 @@ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 $(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
        cd $(srcdir) && $(AUTOCONF)
 
-mostlyclean-binPROGRAMS:
+mostlyclean-libLIBRARIES:
 
-clean-binPROGRAMS:
-       -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+clean-libLIBRARIES:
+       -test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
 
-distclean-binPROGRAMS:
+distclean-libLIBRARIES:
 
-maintainer-clean-binPROGRAMS:
+maintainer-clean-libLIBRARIES:
 
-install-binPROGRAMS: $(bin_PROGRAMS)
+install-libLIBRARIES: $(lib_LIBRARIES)
        @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(bindir)
-       @list='$(bin_PROGRAMS)'; for p in $$list; do \
+       $(mkinstalldirs) $(DESTDIR)$(libdir)
+       @list='$(lib_LIBRARIES)'; for p in $$list; do \
          if test -f $$p; then \
-           echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-            $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+           echo " $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
+           $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
+         else :; fi; \
+       done
+       @$(POST_INSTALL)
+       @list='$(lib_LIBRARIES)'; for p in $$list; do \
+         if test -f $$p; then \
+           echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
+           $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
          else :; fi; \
        done
 
-uninstall-binPROGRAMS:
+uninstall-libLIBRARIES:
        @$(NORMAL_UNINSTALL)
-       list='$(bin_PROGRAMS)'; for p in $$list; do \
-         rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+       list='$(lib_LIBRARIES)'; for p in $$list; do \
+         rm -f $(DESTDIR)$(libdir)/$$p; \
        done
 
 .s.o:
@@ -237,6 +281,36 @@ distclean-compile:
 
 maintainer-clean-compile:
 
+libhadaq.a: $(libhadaq_a_OBJECTS) $(libhadaq_a_DEPENDENCIES)
+       -rm -f libhadaq.a
+       $(AR) cru libhadaq.a $(libhadaq_a_OBJECTS) $(libhadaq_a_LIBADD)
+       $(RANLIB) libhadaq.a
+
+mostlyclean-binPROGRAMS:
+
+clean-binPROGRAMS:
+       -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+
+distclean-binPROGRAMS:
+
+maintainer-clean-binPROGRAMS:
+
+install-binPROGRAMS: $(bin_PROGRAMS)
+       @$(NORMAL_INSTALL)
+       $(mkinstalldirs) $(DESTDIR)$(bindir)
+       @list='$(bin_PROGRAMS)'; for p in $$list; do \
+         if test -f $$p; then \
+           echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+            $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+         else :; fi; \
+       done
+
+uninstall-binPROGRAMS:
+       @$(NORMAL_UNINSTALL)
+       list='$(bin_PROGRAMS)'; for p in $$list; do \
+         rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+       done
+
 daq_xmanage: $(daq_xmanage_OBJECTS) $(daq_xmanage_DEPENDENCIES)
        @rm -f daq_xmanage
        $(LINK) $(daq_xmanage_LDFLAGS) $(daq_xmanage_OBJECTS) $(daq_xmanage_LDADD) $(LIBS)
@@ -277,6 +351,21 @@ daq_ctrlctu: $(daq_ctrlctu_OBJECTS) $(daq_ctrlctu_DEPENDENCIES)
        @rm -f daq_ctrlctu
        $(LINK) $(daq_ctrlctu_LDFLAGS) $(daq_ctrlctu_OBJECTS) $(daq_ctrlctu_LDADD) $(LIBS)
 
+install-includeHEADERS: $(include_HEADERS)
+       @$(NORMAL_INSTALL)
+       $(mkinstalldirs) $(DESTDIR)$(includedir)
+       @list='$(include_HEADERS)'; for p in $$list; do \
+         if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
+         echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p"; \
+         $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p; \
+       done
+
+uninstall-includeHEADERS:
+       @$(NORMAL_UNINSTALL)
+       list='$(include_HEADERS)'; for p in $$list; do \
+         rm -f $(DESTDIR)$(includedir)/$$p; \
+       done
+
 tags: TAGS
 
 ID: $(HEADERS) $(SOURCES) $(LISP)
@@ -399,23 +488,25 @@ check-am: all-am
 check: check-am
 installcheck-am:
 installcheck: installcheck-am
-install-exec-am: install-binPROGRAMS
+install-exec-am: install-libLIBRARIES install-binPROGRAMS
 install-exec: install-exec-am
 
-install-data-am:
+install-data-am: install-includeHEADERS
 install-data: install-data-am
 
 install-am: all-am
        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
-uninstall-am: uninstall-binPROGRAMS
+uninstall-am: uninstall-libLIBRARIES uninstall-binPROGRAMS \
+               uninstall-includeHEADERS
 uninstall: uninstall-am
-all-am: Makefile $(PROGRAMS)
+all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS)
 all-redirect: all-am
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs:
-       $(mkinstalldirs)  $(DESTDIR)$(bindir)
+       $(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \
+               $(DESTDIR)$(includedir)
 
 
 mostlyclean-generic:
@@ -428,43 +519,48 @@ distclean-generic:
 
 maintainer-clean-generic:
        -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-compile \
-               mostlyclean-tags mostlyclean-depend mostlyclean-generic
+mostlyclean-am:  mostlyclean-libLIBRARIES mostlyclean-compile \
+               mostlyclean-binPROGRAMS mostlyclean-tags \
+               mostlyclean-depend mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-binPROGRAMS clean-compile clean-tags clean-depend \
-               clean-generic mostlyclean-am clean-local
+clean-am:  clean-libLIBRARIES clean-compile clean-binPROGRAMS clean-tags \
+               clean-depend clean-generic mostlyclean-am clean-local
 
 clean: clean-am
 
-distclean-am:  distclean-binPROGRAMS distclean-compile distclean-tags \
-               distclean-depend distclean-generic clean-am
+distclean-am:  distclean-libLIBRARIES distclean-compile \
+               distclean-binPROGRAMS distclean-tags distclean-depend \
+               distclean-generic clean-am
 
 distclean: distclean-am
        -rm -f config.status
 
-maintainer-clean-am:  maintainer-clean-binPROGRAMS \
-               maintainer-clean-compile maintainer-clean-tags \
-               maintainer-clean-depend maintainer-clean-generic \
-               distclean-am
+maintainer-clean-am:  maintainer-clean-libLIBRARIES \
+               maintainer-clean-compile maintainer-clean-binPROGRAMS \
+               maintainer-clean-tags maintainer-clean-depend \
+               maintainer-clean-generic distclean-am
        @echo "This command is intended for maintainers to use;"
        @echo "it deletes files that may require special tools to rebuild."
 
 maintainer-clean: maintainer-clean-am
        -rm -f config.status
 
-.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
-maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir mostlyclean-depend \
-distclean-depend clean-depend maintainer-clean-depend info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+.PHONY: mostlyclean-libLIBRARIES distclean-libLIBRARIES \
+clean-libLIBRARIES maintainer-clean-libLIBRARIES uninstall-libLIBRARIES \
+install-libLIBRARIES mostlyclean-compile distclean-compile \
+clean-compile maintainer-clean-compile mostlyclean-binPROGRAMS \
+distclean-binPROGRAMS clean-binPROGRAMS maintainer-clean-binPROGRAMS \
+uninstall-binPROGRAMS install-binPROGRAMS uninstall-includeHEADERS \
+install-includeHEADERS tags mostlyclean-tags distclean-tags clean-tags \
+maintainer-clean-tags distdir mostlyclean-depend distclean-depend \
+clean-depend maintainer-clean-depend info-am info dvi-am dvi check \
+check-am installcheck-am installcheck install-exec-am install-exec \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-redirect all-am all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
 
 
 .x_clnt.c:

diff --git a/hadaq/configure b/hadaq/configure
index b09c0ee0f54182cd002908c83a7717b4e81e9922..adcaf87c0795b99658f0c1b2b7620201aa75584e 100644 (file)
--- a/hadaq/configure
+++ b/hadaq/configure
@@ -1269,7 +1269,7 @@ fi
 
 
 cat >> confdefs.h <<\EOF
-#define NDEBUG 1
+#define _LARGEFILE64_SOURCE 1
 EOF
 
 

diff --git a/hadaq/configure.in b/hadaq/configure.in
index 805b6520cd8ed460db0a6e1bf44146910c3c0429..fd8cf799b4395f573518f45fcc4b9aadda52ac05 100644 (file)
--- a/hadaq/configure.in
+++ b/hadaq/configure.in
@@ -23,7 +23,8 @@ fi
 AC_PROG_INSTALL
 AC_PROG_RANLIB
 
-AC_DEFINE(NDEBUG)
+dnl until there is a better solution, hardcode large file support
+AC_DEFINE(_LARGEFILE64_SOURCE)
 
 dnl Checks for libraries.
 LIBS="-L/usr/local/lib -L$HOME/$host/lib -L/usr/X11R6/lib $LIBS"