diff -rc swarm-2.1.140.20020514/etc/Makefile.am swarm-2.1.140.20020514-Makeamfix/etc/Makefile.am
*** swarm-2.1.140.20020514/etc/Makefile.am	2000-08-14 20:56:40.000000000 -0500
--- swarm-2.1.140.20020514-Makeamfix/etc/Makefile.am	2002-10-18 14:51:21.000000000 -0500
***************
*** 1,9 ****
  EXTRA_DIST = config.swarm.in Makefile.common.in Makefile.appl.in Makefile.lib.in Makefile.rules Makefile.tests.in common.el protocol.el interface.el Makefile.protocol modules
  
  install-data-local:
! 	$(mkinstalldirs) $(sysconfdir)/swarm
! 	$(INSTALL_DATA) config.swarm $(sysconfdir)/swarm
! 	$(INSTALL_DATA) Makefile.appl $(sysconfdir)/swarm
! 	$(INSTALL_DATA) Makefile.lib $(sysconfdir)/swarm
! 	$(INSTALL_DATA) Makefile.common $(sysconfdir)/swarm
! 	$(INSTALL_DATA) $(srcdir)/Makefile.rules $(sysconfdir)/swarm
--- 1,9 ----
  EXTRA_DIST = config.swarm.in Makefile.common.in Makefile.appl.in Makefile.lib.in Makefile.rules Makefile.tests.in common.el protocol.el interface.el Makefile.protocol modules
  
  install-data-local:
! 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/swarm
! 	$(INSTALL_DATA) config.swarm $(DESTDIR)$(sysconfdir)/swarm
! 	$(INSTALL_DATA) Makefile.appl $(DESTDIR)$(sysconfdir)/swarm
! 	$(INSTALL_DATA) Makefile.lib $(DESTDIR)$(sysconfdir)/swarm
! 	$(INSTALL_DATA) Makefile.common $(DESTDIR)$(sysconfdir)/swarm
! 	$(INSTALL_DATA) $(srcdir)/Makefile.rules $(DESTDIR)$(sysconfdir)/swarm
diff -rc swarm-2.1.140.20020514/java/c/Makefile.in swarm-2.1.140.20020514-Makeamfix/java/c/Makefile.in
*** swarm-2.1.140.20020514/java/c/Makefile.in	2001-12-02 12:50:40.000000000 -0600
--- swarm-2.1.140.20020514-Makeamfix/java/c/Makefile.in	2002-10-18 14:54:03.000000000 -0500
***************
*** 57,67 ****
  endif
  
  install-la: all
! 	$(LIBTOOL) --mode=install $(INSTALL) $(_LIBJAVASWARM_LA) $(libdir)
! 	$(LIBTOOL) --mode=finish $(libdir)
  
  install-dll: all
! 	$(INSTALL) $(JAVASWARM_DLL) $(bindir)
  
  %_stubs.m:
  	cat $(addsuffix .m,$($*_creatable_PROTOCOLS)) > $*_stubs.m
--- 57,67 ----
  endif
  
  install-la: all
! 	$(LIBTOOL) --mode=install $(INSTALL) $(_LIBJAVASWARM_LA) $(DESTDIR)$(libdir)
! 	$(LIBTOOL) --mode=finish $(DESTDIR)$(libdir)
  
  install-dll: all
! 	$(INSTALL) $(JAVASWARM_DLL) $(DESTDIR)$(bindir)
  
  %_stubs.m:
  	cat $(addsuffix .m,$($*_creatable_PROTOCOLS)) > $*_stubs.m
***************
*** 70,76 ****
  	$(LIBTOOL) --mode=link $(OBJC) $(CFLAGS) -o $@ -version-info $(STUBSCURRENT):$(STUBSREVISION):$(STUBSAGE) $^
  
  $(_LIBJAVASWARM_LA): $(_LIBJAVASWARMSTUBS_LA) $(libjavaswarm_la_OBJECTS)
! 	$(LIBTOOL) --mode=link $(OBJC) $(CFLAGS) -o $@ -version-info $(CURRENT):$(REVISION):$(AGE) -L$(abs_top_builddir)/libobjc -rpath $(libdir) $(libjavaswarm_la_OBJECTS) $(_LIBJAVASWARMSTUBS_LA) -L$(abs_top_builddir)/src $(SWARMLIBS) -lobjc
  
  ENTRYCMD=-e @JAVASWARM_DLL_ENTRY@
  
--- 70,76 ----
  	$(LIBTOOL) --mode=link $(OBJC) $(CFLAGS) -o $@ -version-info $(STUBSCURRENT):$(STUBSREVISION):$(STUBSAGE) $^
  
  $(_LIBJAVASWARM_LA): $(_LIBJAVASWARMSTUBS_LA) $(libjavaswarm_la_OBJECTS)
! 	$(LIBTOOL) --mode=link $(OBJC) $(CFLAGS) -o $@ -version-info $(CURRENT):$(REVISION):$(AGE) -L$(abs_top_builddir)/libobjc -rpath $(DESTDIR)$(libdir) $(libjavaswarm_la_OBJECTS) $(_LIBJAVASWARMSTUBS_LA) -L$(abs_top_builddir)/src $(SWARMLIBS) -lobjc
  
  ENTRYCMD=-e @JAVASWARM_DLL_ENTRY@
  
diff -rc swarm-2.1.140.20020514/java/Makefile.am swarm-2.1.140.20020514-Makeamfix/java/Makefile.am
*** swarm-2.1.140.20020514/java/Makefile.am	2001-11-04 14:23:27.000000000 -0600
--- swarm-2.1.140.20020514-Makeamfix/java/Makefile.am	2002-10-18 14:57:48.000000000 -0500
***************
*** 26,32 ****
  
  all: $($(JAVASTUBS)_ALL)
  install: $($(JAVASTUBS)_INSTALL) install-binSCRIPTS
! 	test -z "$(KAWAJAR)" || $(INSTALL) $(srcdir)/$(KAWAJAR) $(datadir)/swarm/kawa.jar
  
  all-stubs: stubs
  	$(MAKE) -C c all
--- 26,32 ----
  
  all: $($(JAVASTUBS)_ALL)
  install: $($(JAVASTUBS)_INSTALL) install-binSCRIPTS
! 	test -z "$(KAWAJAR)" || $(INSTALL) $(srcdir)/$(KAWAJAR) $(DESTDIR)$(datadir)/swarm/kawa.jar
  
  all-stubs: stubs
  	$(MAKE) -C c all
***************
*** 56,59 ****
  # don't link against javaswarm -- this will screw up constructors
  # when the library load happens from Java
  libgcjswarm.la: $(JAVA_OBJS)
! 	libtool-new --mode=link gcc $(JAVA_OBJS) -o libgcjswarm.la -rpath $(libdir)
--- 56,59 ----
  # don't link against javaswarm -- this will screw up constructors
  # when the library load happens from Java
  libgcjswarm.la: $(JAVA_OBJS)
! 	libtool-new --mode=link gcc $(JAVA_OBJS) -o libgcjswarm.la -rpath $(DESTDIR)$(libdir)
diff -rc swarm-2.1.140.20020514/libobjc/Makefile.am swarm-2.1.140.20020514-Makeamfix/libobjc/Makefile.am
*** swarm-2.1.140.20020514/libobjc/Makefile.am	2001-11-06 01:40:21.000000000 -0600
--- swarm-2.1.140.20020514-Makeamfix/libobjc/Makefile.am	2002-10-18 15:25:56.000000000 -0500
***************
*** 18,24 ****
  #EXTRA_PROGRAMS = objc.dll
  
  libobjc_la_SOURCES = $(CSRC) $(MSRC)
! libobjc_la_LDFLAGS = -version-info $(CURRENT):$(REVISION):$(AGE) -rpath $(libdir) # -L$(dir $(shell $(CC) -print-libgcc-file-name))
  libobjc_la_LIBADD = $(objc_thread_lo) -lgcc
  libobjc_la_DEPENDENCIES = $(objc_thread_lo)
  
--- 18,24 ----
  #EXTRA_PROGRAMS = objc.dll
  
  libobjc_la_SOURCES = $(CSRC) $(MSRC)
! libobjc_la_LDFLAGS = -version-info $(CURRENT):$(REVISION):$(AGE) -rpath $(DESTDIR)$(libdir) # -L$(dir $(shell $(CC) -print-libgcc-file-name))
  libobjc_la_LIBADD = $(objc_thread_lo) -lgcc
  libobjc_la_DEPENDENCIES = $(objc_thread_lo)
  
***************
*** 43,50 ****
  #$(CC) -Wl,-shared -Wl,--export-all-symbols -Wl,--output-def,libobjc.def -Wl,--out-implib,libobjcdll.a -o objc.dll objc.dll.o $(DLLOBJS) $(objc_thread_lo)
  
  install-data-local: 
! 	$(INSTALL) libobjcdll.a $(libdir)
! 	ranlib $(libdir)/libobjcdll.a
  endif
  
  #CC1OBJ = @gccdir@/cc1obj
--- 43,50 ----
  #$(CC) -Wl,-shared -Wl,--export-all-symbols -Wl,--output-def,libobjc.def -Wl,--out-implib,libobjcdll.a -o objc.dll objc.dll.o $(DLLOBJS) $(objc_thread_lo)
  
  install-data-local: 
! 	$(INSTALL) libobjcdll.a $(DESTDIR)$(libdir)
! 	ranlib $(DESTDIR)$(libdir)/libobjcdll.a
  endif
  
  #CC1OBJ = @gccdir@/cc1obj
diff -rc swarm-2.1.140.20020514/libobjc/objc/Makefile.am swarm-2.1.140.20020514-Makeamfix/libobjc/objc/Makefile.am
*** swarm-2.1.140.20020514/libobjc/objc/Makefile.am	2001-11-12 18:21:32.000000000 -0600
--- swarm-2.1.140.20020514-Makeamfix/libobjc/objc/Makefile.am	2002-10-18 15:02:54.000000000 -0500
***************
*** 22,27 ****
  all-local: mframe.h
  
  install-data-local: install-objcHEADERS
! 	$(INSTALL) mframe.h $(includedir)/objc
! 	$(INSTALL) externvar.h $(includedir)/objc
  
--- 22,27 ----
  all-local: mframe.h
  
  install-data-local: install-objcHEADERS
! 	$(INSTALL) mframe.h $(DESTDIR)$(includedir)/objc
! 	$(INSTALL) externvar.h $(DESTDIR)$(includedir)/objc
  
diff -rc swarm-2.1.140.20020514/Makefile.am swarm-2.1.140.20020514-Makeamfix/Makefile.am
*** swarm-2.1.140.20020514/Makefile.am	2001-12-02 12:52:25.000000000 -0600
--- swarm-2.1.140.20020514-Makeamfix/Makefile.am	2002-10-18 15:27:22.000000000 -0500
***************
*** 9,18 ****
  SWARM_INSTALL = @SWARM_INSTALL@
  
  install-data-local:
! 	$(INSTALL_DATA) swarmconfig.h $(includedir)
! 	$(INSTALL_DATA) externvar.h $(includedir)
! 	$(mkinstalldirs) $(bindir) $(datadir)/swarm
! 	$(INSTALL_PROGRAM) $(top_builddir)/libtool $(bindir)/libtool-swarm
! 	if test $(SWARM_INSTALL) = install-sh; then $(INSTALL_PROGRAM) $(srcdir)/install-sh $(bindir); fi
  
  install-recursive: install-data-local
--- 9,19 ----
  SWARM_INSTALL = @SWARM_INSTALL@
  
  install-data-local:
! 	$(mkinstalldirs) $(DESTDIR)$(includedir)
! 	$(INSTALL_DATA) swarmconfig.h $(DESTDIR)$(includedir)
! 	$(INSTALL_DATA) externvar.h $(DESTDIR)$(includedir)
! 	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)/swarm
! 	$(INSTALL_PROGRAM) $(top_builddir)/libtool $(DESTDIR)$(bindir)/libtool-swarm
! 	if test $(SWARM_INSTALL) = install-sh; then $(INSTALL_PROGRAM) $(srcdir)/install-sh $(DESTDIR)$(bindir); fi
  
  install-recursive: install-data-local
diff -rc swarm-2.1.140.20020514/src/activity/Makefile.am swarm-2.1.140.20020514-Makeamfix/src/activity/Makefile.am
*** swarm-2.1.140.20020514/src/activity/Makefile.am	2001-11-04 13:55:49.000000000 -0600
--- swarm-2.1.140.20020514-Makeamfix/src/activity/Makefile.am	2002-10-18 15:12:03.000000000 -0500
***************
*** 26,30 ****
  activity_HEADERS = Action.h ActionGroup.h CompoundAction.h Schedule.h SwarmProcess.h XActivity.h
  
  install-data-local:
! 	$(INSTALL_DATA) classes.h $(activitydir)
! 	$(INSTALL_DATA) types.h $(activitydir)
--- 26,30 ----
  activity_HEADERS = Action.h ActionGroup.h CompoundAction.h Schedule.h SwarmProcess.h XActivity.h
  
  install-data-local:
! 	$(INSTALL_DATA) classes.h $(DESTDIR)$(activitydir)
! 	$(INSTALL_DATA) types.h $(DESTDIR)$(activitydir)
diff -rc swarm-2.1.140.20020514/src/collections/Makefile.am swarm-2.1.140.20020514-Makeamfix/src/collections/Makefile.am
*** swarm-2.1.140.20020514/src/collections/Makefile.am	2001-11-04 13:52:53.000000000 -0600
--- swarm-2.1.140.20020514-Makeamfix/src/collections/Makefile.am	2002-10-18 15:18:12.000000000 -0500
***************
*** 26,32 ****
  collections_HEADERS = Array.h Collection.h InputStream.h Stream.h List.h List_GEN.h List_linked.h List_mlinks.h ListShuffler.h Map.h OrderedSet.h OutputStream.h Set.h Permutation.h StringObject.h collections.h predicates.h macros.h
  
  install-data-local:
! 	$(INSTALL_DATA) classes.h $(collectionsdir)
! 	$(INSTALL_DATA) types.h $(collectionsdir)
  
  
--- 26,32 ----
  collections_HEADERS = Array.h Collection.h InputStream.h Stream.h List.h List_GEN.h List_linked.h List_mlinks.h ListShuffler.h Map.h OrderedSet.h OutputStream.h Set.h Permutation.h StringObject.h collections.h predicates.h macros.h
  
  install-data-local:
! 	$(INSTALL_DATA) classes.h $(DESTDIR)$(collectionsdir)
! 	$(INSTALL_DATA) types.h $(DESTDIR)$(collectionsdir)
  
  
diff -rc swarm-2.1.140.20020514/src/defobj/Makefile.am swarm-2.1.140.20020514-Makeamfix/src/defobj/Makefile.am
*** swarm-2.1.140.20020514/src/defobj/Makefile.am	2001-11-12 18:21:52.000000000 -0600
--- swarm-2.1.140.20020514-Makeamfix/src/defobj/Makefile.am	2002-10-18 15:19:15.000000000 -0500
***************
*** 41,49 ****
  	sed -n '2s/^[0-9][0-9]*\.[0-9][0-9]*\.\([0-9][0-9]*\)/#define SWARM_SUBMINOR \1/p' < $< >> $@
  
  install-data-local: install-defobjHEADERS
! 	$(INSTALL_DATA) classes.h $(defobjdir)
! 	$(INSTALL_DATA) types.h $(defobjdir)
! 	$(INSTALL_DATA) version.h $(defobjdir)
  
   include $(top_srcdir)/etc/Makefile.protocol
  
--- 41,49 ----
  	sed -n '2s/^[0-9][0-9]*\.[0-9][0-9]*\.\([0-9][0-9]*\)/#define SWARM_SUBMINOR \1/p' < $< >> $@
  
  install-data-local: install-defobjHEADERS
! 	$(INSTALL_DATA) classes.h $(DESTDIR)$(defobjdir)
! 	$(INSTALL_DATA) types.h $(DESTDIR)$(defobjdir)
! 	$(INSTALL_DATA) version.h $(DESTDIR)$(defobjdir)
  
   include $(top_srcdir)/etc/Makefile.protocol
  
diff -rc swarm-2.1.140.20020514/src/Makefile.am swarm-2.1.140.20020514-Makeamfix/src/Makefile.am
*** swarm-2.1.140.20020514/src/Makefile.am	2001-11-06 01:40:59.000000000 -0600
--- swarm-2.1.140.20020514-Makeamfix/src/Makefile.am	2002-10-18 15:21:20.000000000 -0500
***************
*** 51,57 ****
  
  INCLUDES = -I$(top_builddir)/libobjc -I$(top_srcdir)/libobjc -I$(srcdir)/collections -I$(srcdir)/defobj -I$(srcdir)/activity -I$(srcdir)/objectbase -I$(srcdir)/random -I$(srcdir)/simtools -I$(srcdir)/gui -I$(srcdir)/simtoolsgui -I$(srcdir)/misc -I. -I$(srcdir) $(JAVAINCLUDES)
  
! libswarm_la_LDFLAGS = -version-info $(CURRENT):$(REVISION):$(AGE) -rpath $(libdir) $(foreach module,$(SWARMMODULES),-L$(module)) -L../libobjc $(SUPPORTLDFLAGS) # -L$(dir $(shell $(CC) -print-libgcc-file-name)) 
  
  DLLWRAP = @DLLWRAP@
  if USEDLL
--- 51,57 ----
  
  INCLUDES = -I$(top_builddir)/libobjc -I$(top_srcdir)/libobjc -I$(srcdir)/collections -I$(srcdir)/defobj -I$(srcdir)/activity -I$(srcdir)/objectbase -I$(srcdir)/random -I$(srcdir)/simtools -I$(srcdir)/gui -I$(srcdir)/simtoolsgui -I$(srcdir)/misc -I. -I$(srcdir) $(JAVAINCLUDES)
  
! libswarm_la_LDFLAGS = -version-info $(CURRENT):$(REVISION):$(AGE) -rpath $(DESTDIR)$(libdir) $(foreach module,$(SWARMMODULES),-L$(module)) -L../libobjc $(SUPPORTLDFLAGS) # -L$(dir $(shell $(CC) -print-libgcc-file-name)) 
  
  DLLWRAP = @DLLWRAP@
  if USEDLL
***************
*** 64,70 ****
  #$(CC) -nostdlib -Wl,-shared -Wl,--export-all-symbols -Wl,--out-implib,libswarmdll.a -Wl,--output-def,swarm.def -o swarm.dll swarm.dll.o $(patsubst %.lo,%.o,$(OBJS)) -L../libobjc $(SUPPORTLDFLAGS) -lobjcdll $(SYSLIBS) -lcygwin -lkernel32 `$(CC) -print-libgcc-file-name`
  
  install-data-local: 
! 	$(INSTALL) libswarmdll.a $(libdir)
! 	ranlib $(libdir)/libswarmdll.a
  endif
  
--- 64,70 ----
  #$(CC) -nostdlib -Wl,-shared -Wl,--export-all-symbols -Wl,--out-implib,libswarmdll.a -Wl,--output-def,swarm.def -o swarm.dll swarm.dll.o $(patsubst %.lo,%.o,$(OBJS)) -L../libobjc $(SUPPORTLDFLAGS) -lobjcdll $(SYSLIBS) -lcygwin -lkernel32 `$(CC) -print-libgcc-file-name`
  
  install-data-local: 
! 	$(INSTALL) libswarmdll.a $(DESTDIR)$(libdir)
! 	ranlib $(DESTDIR)$(libdir)/libswarmdll.a
  endif
  
Only in swarm-2.1.140.20020514-Makeamfix/: static