--- a/lisp/oobr/tree-x/Makefile	Mon Aug 13 09:00:04 2007 +0200
+++ b/lisp/oobr/tree-x/Makefile	Mon Aug 13 09:02:59 2007 +0200
@@ -1,62 +1,46 @@
 #
-# SUMMARY:      Makefile for the OO-Browser
+# SUMMARY:      What's new in this version of the OO-Browser?
 #
 # AUTHOR:       Bob Weiner / Mark Stern
-# ORG:          InfoDock Associates / Brown U.
 #
 # ORIG-DATE:    15-Oct-90
-# LAST-MOD:     19-Oct-96 at 00:53:29 by Bob Weiner
+# LAST-MOD:     14-Sep-95 at 10:20:41 by Bob Weiner
 #
-# Copyright (C) 1990-1996  Free Software Foundation, Inc.
+# Copyright (C) 1990-1995  Free Software Foundation, Inc.
 # See the file BR-COPY for license information.
 #
 # This file is part of the OO-Browser.
 
-# If the usleep () system call exists on your system, uncomment the following line.
+# Use -DHAVE_USLEEP if usleep() is a valid system call. Otherwise, comment
+# out this line or set its value to be empty, in which case the definition in
+# "usleep.c" will be used..
 DEFINES         = -DHAVE_USLEEP
+# Use the line below instead under Solaris.
+# DEFINES         = -DSYSV
 
 # Root directory of your X distribution.  Note how this is used in succeeding
 # variables.
-XROOT           = /usr/X11
+XROOT           = /usr/moto/X11R5
 LD_LIBRARY_PATH = $(XROOT)/lib
 INCLUDEDIRS     = -I$(XROOT)/include
 LIBDIRS         = -L$(XROOT)/lib
 
-# Use this for the standard Athena widgets.
-XAW = -lXaw
-# Use this instead for the 3D Athena widget library.
-XAW3D = -lXaw3d
-# Set this to one of the 2 above variable names.
-DEFXAW = XAW
-# Set this to one of the 2 above variable values.
-LIBXAW = $(XAW)
-
 # C compiler
 CC		= gcc
 # Compiler flags
-CFLAGS		= -g -O $(INCLUDEDIRS) $(DEFINES) -D$(DEFXAW)
-
-#   Set XVERSION to the proper relase of X11 for your system.
-#   Use X11R5 if you system is not on X11R6 or above.
-X11R5 = 
-X11R6 = -lSM -lICE
-XVERSION = $(X11R6)
+CFLAGS		= -g -O $(INCLUDEDIRS) $(DEFINES)
 
-#   X11 libraries used by all system configurations.
-XCOMMON = -lXmu -lXt -lX11 -lXext
-
-#   This is used for static linking on a generic platform such as SunOS 4.
-LD_STATIC   	 = -static $(LIBDIRS) $(LIBXAW) $(XCOMMON) $(XVERSION)
-#   This is used for dynamic linking under Solaris.
-LD_SOLARIS       = $(LIBDIRS) $(LIBXAW) $(XCOMMON) -lsocket $(XVERSION)
-#   This is used for dynamic linking under Linux.
-LD_LINUX         = $(LIBDIRS) $(LIBXAW) $(XCOMMON) $(XVERSION)
+# Linker flags.  Remove the -static for dynamic linking, e.g. under Linux.
+# LDFLAGS		= -static $(LIBDIRS) -lXaw -lXmu -lXt -lX11 -lXext
+# Use the line below instead under Solaris.
+# LDFLAGS        = $(LIBDIRS) -lXaw -lXmu -lXt -lX11 -lXext -lsocket
+LDFLAGS        = $(LIBDIRS) -lXaw -lXmu -lXt -lX11 -lXext
 
 # Set this to be the directory in which to install the X OO-Browser
 # executable.  This should be a directory in all users' search paths or the
 # value of the Emacs variable, exec-directory.
 # Use 'make install' to install the binary.
-BINDIR          = /home/infodock/lib-bin-linux-elf
+BINDIR          = /usr/local/infodock/bin
 
 NAME		= xoobr
 C_FILES 	= draw.c tree.c input.c dissolve.c dbl.c intf.c usleep.c
@@ -64,17 +48,8 @@
 INC_FILES	= defs.h tree.h input.h dissolve.h dbl.h rsrc.h intf.h help.h
 SRC_FILES	= $(INC_FILES) $(C_FILES)
 
-$(NAME):	linux
-
-static:		$(O_FILES)
-		$(CC) $(CFLAGS) -o $(NAME) $(O_FILES) $(LD_STATIC)
-
-solaris:	$(O_FILES)
-		$(CC) $(CFLAGS) -DSYSV -o $(NAME) $(O_FILES) $(LD_SOLARIS)
-
-linux:		$(O_FILES)
-		$(CC) $(CFLAGS) -o $(NAME) $(O_FILES) $(LD_LINUX)
-
+$(NAME):	$(O_FILES)
+		$(CC) $(CFLAGS) -o $(NAME) $(O_FILES) $(LDFLAGS)
 
 install:	$(NAME)
 		chmod 755 $(NAME)