ChangeLogTag:Mon Sep 27 17:04:29 2004 Steve Huston <shuston@riverace.com>

4 files changed, 352 insertions, 161 deletions

diff --git a/apps/Makefile.am b/apps/Makefile.am
index 1d353b3d709..df5ee272ad5 100644
--- a/apps/Makefile.am
+++ b/apps/Makefile.am
@@ -1,23 +1,20 @@
-##---------------------------------------------------------------------------
-##       $Id$
+##  Process this file with automake to create Makefile.in
 ##
-##       Makefile for the apps directory
+## $Id$
 ##
-##---------------------------------------------------------------------------
-
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
 ##
-##  Process this file with automake to create Makefile.in
-##
-
-if COMPILE_GPERF
-GPERF_DIR = gperf
-else
-GPERF_DIR = 
-endif
+## MPC Command:
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu
 
-SUBDIRS = $(GPERF_DIR)
-## SUBDIRS = Gateway \
-##           JAWS \
-##           gperf
+##SUBDIRS = \
+##        Gateway \
+##        JAWS \
+##        JAWS3 \
+##        drwho \
+##        gperf \
+##        mkcsregdb \
+##        soreduce
 
-## EXTRA_DIST = README
+SUBDIRS = gperf
diff --git a/apps/gperf/Makefile.am b/apps/gperf/Makefile.am
index 866c41f9c99..337a136e42e 100644
--- a/apps/gperf/Makefile.am
+++ b/apps/gperf/Makefile.am
@@ -1,22 +1,14 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Top-level Makefile for gperf
+##  Process this file with automake to create Makefile.in
 ##
-##---------------------------------------------------------------------------
-
+## $Id$
 ##
-##  Process this file with automake to create Makefile.in
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
 ##
+## MPC Command:
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu
 
-SUBDIRS = src ##tests
-
-GPERF_VERSION = 2.0
-
-VERSION = $(GPERF_VERSION)
-
-info_TEXINFOS = gperf.texi
-
-man_MANS = gperf.1
+SUBDIRS = \
+        src \
+        tests
 
-EXTRA_DIST = $(man_MANS) gperf.info
diff --git a/apps/gperf/src/Makefile.am b/apps/gperf/src/Makefile.am
index f989809530d..614c1367f0c 100644
--- a/apps/gperf/src/Makefile.am
+++ b/apps/gperf/src/Makefile.am
@@ -1,36 +1,46 @@
-##---------------------------------------------------------------------------
-##       $Id$
+##  Process this file with automake to create Makefile.in
 ##
-##       Makefile for GPERF release
-##---------------------------------------------------------------------------
-
+## $Id$
 ##
-##  Process this file with automake to create Makefile.in
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
 ##
+## MPC Command:
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu
 
-AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
-
+## Makefile.gperf.am 
 bin_PROGRAMS = gperf
 
+gperf_CPPFLAGS = \
+  -I$(top_builddir) \
+  -I$(top_srcdir) \
+  -I$(top_srcdir)
+
 gperf_SOURCES = \
-         gperf.cpp  \
-         Bool_Array.cpp  \
-         Gen_Perf.cpp  \
-         Hash_Table.cpp  \
-         Iterator.cpp  \
-         Key_List.cpp  \
-         List_Node.cpp  \
-         Options.cpp  \
-         Vectors.cpp  \
-         Version.cpp
-gperf_LDADD = $(top_builddir)/ace/libACE.la
+  Bool_Array.cpp \
+  Gen_Perf.cpp \
+  Hash_Table.cpp \
+  Iterator.cpp \
+  Key_List.cpp \
+  List_Node.cpp \
+  Options.cpp \
+  Vectors.cpp \
+  Version.cpp \
+  gperf.cpp \
+  Bool_Array.h \
+  Gen_Perf.h \
+  Hash_Table.h \
+  Iterator.h \
+  Key_List.h \
+  List_Node.h \
+  Options.h \
+  Vectors.h
+
+gperf_LDADD = \
+ $(top_builddir)/ace/libACE.la
 
-noinst_HEADERS = \
-         Bool_Array.h  \
-         Gen_Perf.h  \
-         Hash_Table.h  \
-         Iterator.h  \
-         Key_List.h  \
-         List_Node.h  \
-         Options.h  \
-         Vectors.h
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -f gcctemp.c gcctemp so_locations
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/apps/gperf/tests/Makefile.am b/apps/gperf/tests/Makefile.am
index c5ee4623956..b42771d508f 100644
--- a/apps/gperf/tests/Makefile.am
+++ b/apps/gperf/tests/Makefile.am
@@ -1,115 +1,307 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-## Copyright (C) 1989, 1992, 1993 Free Software Foundation, Inc.
-## Original makefile written by Douglas C. Schmidt (schmidt@ics.uci.edu)
-## This Makefile.am written by Ossama Othman (othman@astrosun.tn.cornell.edu)
-## 
-## This file is part of GNU GPERF.
-## 
-## GNU GPERF is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 1, or (at your option)
-## any later version.
-## 
-## GNU GPERF is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-## 
-## You should have received a copy of the GNU General Public License
-## along with GNU GPERF; see the file COPYING.  If not, write to the Free
-## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111, USA. 
+##  Process this file with automake to create Makefile.in
 ##
-##       Makefile for GPERF tests
-##---------------------------------------------------------------------------
-
+## $Id$
 ##
-##  Process this file with automake to create Makefile.in
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
 ##
+## MPC Command:
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu
 
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
+ACE_ROOT = $(top_srcdir)
 
+## Makefile.adainset.am 
 
-noinst_PROGRAMS = cout aout cppout preout m3out pout iout iout2 tout
+BUILT_SOURCES = \
+  ada.cpp
 
-cout_SOURCES = cinset.cpp test.cpp
+CLEANFILES = \
+  ada.cpp \
+  ada-stamp
 
-aout_SOURCES = adainset.cpp test.cpp
+ada.cpp: ada-stamp
 
-cppout_SOURCES = cppinset.cpp test.cpp
+ada-stamp: $(srcdir)/ada.gperf
+	$(top_builddir)/apps/gperf/src/gperf -a -k1,4,$$ $(srcdir)/ada.gperf> $@
+	@touch $@
 
-preout_SOURCES = preinset.cpp test.cpp
+noinst_PROGRAMS = aout
 
-m3out_SOURCES = m3inset.cpp test.cpp
+aout_CPPFLAGS = \
+  -I$(top_builddir) \
+  -I$(top_srcdir) \
+  -I$(top_srcdir)
 
-pout_SOURCES = pinset.cpp test.cpp
+aout_SOURCES = \
+  ada.cpp \
+  test.cpp
 
-iout_SOURCES = iinset.cpp test.cpp
+aout_LDADD = \
+ $(top_builddir)/ace/libACE.la
 
-iout_SOURCES = iinset2.cpp test.cpp
+## Makefile.cinset.am 
 
-tout_SOURCES = tinset.cpp test.cpp
+BUILT_SOURCES += \
+  c.cpp
 
-BUILT_SOURCES = \
-        cinset.cpp \
-        adainset.cpp \
-        cppinset.cpp \
-        preinset.cpp \
-        m3inset.cpp \
-        pinset.cpp \
-        iinset.cpp \
-        iinset2.cpp \
-        tinset.cpp
-
-EXTRA_DIST = \
-        gpc.gperf \
-        gplus.gperf \
-        irc.gperf \
-        makeinfo.gperf \
-        modula2.gperf \
-        ada-pred.exp \
-        ada-res.exp \
-        cpp-res.exp \
-        c.exp \
-        corba.exp \
-        idl.exp \
-        modula.exp \
-        pascal.exp \
-        test-1.exp \
-        test-2.exp \
-        test-3.exp \
-        test-4.exp \
-        test-5.exp \
-        test-6.exp \
-        test-7.exp
-
-cinset.cpp: c.gperf
-        $(GPERF) -a -p -c -l -S1 -o $(srcdir)/c.gperf > cinset.cpp
-
-adainset.cpp: ada.gperf
-        $(GPERF) -a -k1,4,'$$' $(srcdir)/ada.gperf > adainset.cpp
-
-cppinset.cpp: cpp.gperf
-        $(GPERF) -a -D $(srcdir)/cpp.gperf > cppinset.cpp
-
-preinset.cpp: adadefs.gperf
-        $(GPERF) -a -p -D -k1,'$$' -s 2 -o $(srcdir)/adadefs.gperf > preinset.cpp
-
-m3inset.cpp: modula3.gperf
-        $(GPERF) -a -k1,2,'$$' -o $(srcdir)/modula3.gperf > m3inset.cpp
-
-pinset.cpp: pascal.gperf
-        $(GPERF) -a -o -S2 -p < $(srcdir)/pascal.gperf > pinset.cpp
-
-iinset.cpp: idl.gperf
-        $(GPERF) -m -M -c -C -D -S1 -E -T -a -o -p < $(srcdir)/idl.gperf > iinset.cpp
-
-iinset2.cpp: idl.gperf
-        $(GPERF) -m -M -c -C -D -E -T -a -o -p < $(srcdir)/idl.gperf > iinset.cpp
-
-tinset.cpp: corba.gperf
-        $(GPERF) -a -o < $(srcdir)/corba.gperf > tinset.cpp
+CLEANFILES += \
+  c.cpp \
+  c-stamp
+
+c.cpp: c-stamp
+
+c-stamp: $(srcdir)/c.gperf
+	$(top_builddir)/apps/gperf/src/gperf -a -p -c -l -S1 -o $(srcdir)/c.gperf> $@
+	@touch $@
+
+noinst_PROGRAMS += cout
+
+cout_CPPFLAGS = \
+  -I$(top_builddir) \
+  -I$(top_srcdir) \
+  -I$(top_srcdir)
+
+cout_SOURCES = \
+  c.cpp \
+  test.cpp
+
+cout_LDADD = \
+ $(top_builddir)/ace/libACE.la
+
+## Makefile.cppinset.am 
+
+BUILT_SOURCES += \
+  cpp.cpp
+
+CLEANFILES += \
+  cpp.cpp \
+  cpp-stamp
+
+cpp.cpp: cpp-stamp
+
+cpp-stamp: $(srcdir)/cpp.gperf
+	$(top_builddir)/apps/gperf/src/gperf -a -D $(srcdir)/cpp.gperf> $@
+	@touch $@
+
+noinst_PROGRAMS += cppout
+
+cppout_CPPFLAGS = \
+  -I$(top_builddir) \
+  -I$(top_srcdir) \
+  -I$(top_srcdir)
+
+cppout_SOURCES = \
+  cpp.cpp \
+  test.cpp
+
+cppout_LDADD = \
+ $(top_builddir)/ace/libACE.la
+
+## Makefile.iinset.am 
+
+BUILT_SOURCES += \
+  idl.cpp
+
+CLEANFILES += \
+  idl.cpp \
+  idl-stamp
+
+idl.cpp: idl-stamp
+
+idl-stamp: $(srcdir)/idl.gperf
+	$(top_builddir)/apps/gperf/src/gperf -m -M -c -C -D -S1 -E -T -a -o -p $(srcdir)/idl.gperf> $@
+	@touch $@
+
+noinst_PROGRAMS += iout
+
+iout_CPPFLAGS = \
+  -I$(top_builddir) \
+  -I$(top_srcdir) \
+  -I$(top_srcdir)
+
+iout_SOURCES = \
+  idl.cpp \
+  test.cpp
+
+iout_LDADD = \
+ $(top_builddir)/ace/libACE.la
+
+## Makefile.iinset2.am 
+
+BUILT_SOURCES += \
+  idl.cpp
+
+CLEANFILES += \
+  idl.cpp \
+  idl-stamp
+
+idl.cpp: idl-stamp
+
+idl-stamp: $(srcdir)/idl.gperf
+	$(top_builddir)/apps/gperf/src/gperf -m -M -c -C -D -E -T -a -o -p $(srcdir)/idl.gperf> $@
+	@touch $@
+
+noinst_PROGRAMS += iout2
+
+iout2_CPPFLAGS = \
+  -I$(top_builddir) \
+  -I$(top_srcdir) \
+  -I$(top_srcdir)
+
+iout2_SOURCES = \
+  idl.cpp \
+  test.cpp
+
+iout2_LDADD = \
+ $(top_builddir)/ace/libACE.la
+
+## Makefile.m3inset.am 
+
+BUILT_SOURCES += \
+  modula3.cpp
+
+CLEANFILES += \
+  modula3.cpp \
+  modula3-stamp
+
+modula3.cpp: modula3-stamp
+
+modula3-stamp: $(srcdir)/modula3.gperf
+	$(top_builddir)/apps/gperf/src/gperf -a -k1,2,$$ $(srcdir)/modula3.gperf> $@
+	@touch $@
+
+noinst_PROGRAMS += m3out
+
+m3out_CPPFLAGS = \
+  -I$(top_builddir) \
+  -I$(top_srcdir) \
+  -I$(top_srcdir)
+
+m3out_SOURCES = \
+  modula3.cpp \
+  test.cpp
+
+m3out_LDADD = \
+ $(top_builddir)/ace/libACE.la
+
+## Makefile.pinset.am 
+
+BUILT_SOURCES += \
+  pascal.cpp
+
+CLEANFILES += \
+  pascal.cpp \
+  pascal-stamp
+
+pascal.cpp: pascal-stamp
+
+pascal-stamp: $(srcdir)/pascal.gperf
+	$(top_builddir)/apps/gperf/src/gperf -a -o -S2 -p $(srcdir)/pascal.gperf> $@
+	@touch $@
+
+noinst_PROGRAMS += pout
+
+pout_CPPFLAGS = \
+  -I$(top_builddir) \
+  -I$(top_srcdir) \
+  -I$(top_srcdir)
+
+pout_SOURCES = \
+  pascal.cpp \
+  test.cpp
+
+pout_LDADD = \
+ $(top_builddir)/ace/libACE.la
+
+## Makefile.preinset.am 
+
+BUILT_SOURCES += \
+  adadefs.cpp
+
+CLEANFILES += \
+  adadefs.cpp \
+  adadefs-stamp
+
+adadefs.cpp: adadefs-stamp
+
+adadefs-stamp: $(srcdir)/adadefs.gperf
+	$(top_builddir)/apps/gperf/src/gperf -a -p -D -k1,$$ -s 2 -o $(srcdir)/adadefs.gperf> $@
+	@touch $@
+
+noinst_PROGRAMS += preout
+
+preout_CPPFLAGS = \
+  -I$(top_builddir) \
+  -I$(top_srcdir) \
+  -I$(top_srcdir)
+
+preout_SOURCES = \
+  adadefs.cpp \
+  test.cpp
+
+preout_LDADD = \
+ $(top_builddir)/ace/libACE.la
+
+## Makefile.taoinset.am 
+
+BUILT_SOURCES += \
+  tao.cpp
+
+CLEANFILES += \
+  tao.cpp \
+  tao-stamp
+
+tao.cpp: tao-stamp
+
+tao-stamp: $(srcdir)/tao.gperf
+	$(top_builddir)/apps/gperf/src/gperf -c -C -D -E -f 0 -a -o $(srcdir)/tao.gperf> $@
+	@touch $@
+
+noinst_PROGRAMS += taoout
+
+taoout_CPPFLAGS = \
+  -I$(top_builddir) \
+  -I$(top_srcdir) \
+  -I$(top_srcdir)
+
+taoout_SOURCES = \
+  tao.cpp \
+  test.cpp
+
+taoout_LDADD = \
+ $(top_builddir)/ace/libACE.la
+
+## Makefile.tinset.am 
+
+BUILT_SOURCES += \
+  corba.cpp
+
+CLEANFILES += \
+  corba.cpp \
+  corba-stamp
+
+corba.cpp: corba-stamp
+
+corba-stamp: $(srcdir)/corba.gperf
+	$(top_builddir)/apps/gperf/src/gperf -a -o $(srcdir)/corba.gperf> $@
+	@touch $@
+
+noinst_PROGRAMS += tout
+
+tout_CPPFLAGS = \
+  -I$(top_builddir) \
+  -I$(top_srcdir) \
+  -I$(top_srcdir)
+
+tout_SOURCES = \
+  corba.cpp \
+  test.cpp
+
+tout_LDADD = \
+ $(top_builddir)/ace/libACE.la
 
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -f gcctemp.c gcctemp so_locations
+	-rm -rf ptrepository SunWS_cache Templates.DB