From 5dfe0f5f214b97ff96ed1eb88ee3d85c02636089 Mon Sep 17 00:00:00 2001
From: Linas Vepstas <linas@linas.org>
Date: Sun, 1 Mar 1998 17:19:43 +0000
Subject: [PATCH] merge in changes from 1.0 branch

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@569 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 src/Makefile    | 11 ++++++-----
 src/Makefile.in |  9 +++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 7dbcff8a66..e8d28becca 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -30,6 +30,7 @@ CC       = gcc
 INCLPATH = -I/usr/include \
            -I.. \
            -I./register \
+           -I/usr/local/include \
            -I/usr/X11R6/include/. \
            -I./../include \
            -I./../lib/ComboBox-1.33 \
@@ -41,11 +42,11 @@ INCLPATH = -I/usr/include \
 #           -I./../lib/libhtmlw 
 
 CFLAGS   = -g -DCELL_WIDGETS=1
-LFLAGS   = -O2
+LFLAGS   = -g
 LIBS     = -lXpm -lXm -lXmu -lXt -lXext  -lSM -lICE -lX11  -lpng -ljpeg -lz -lm
-LIBPATH  = -L/lib -L/usr/lib -L/usr/X11R6/lib/.
-TARGET   = ../xacc
-STATIC   = ../xacc-static
+LIBPATH  = -L/lib -L/usr/lib -L/usr/local/lib -L/usr/X11R6/lib/.
+TARGET   = ../xacc.bin
+STATIC   = ../xacc-static.bin
 
 # LIBHTMLW = ../lib/libhtmlw/libhtmlw.a
 LIBXMHTML= ../lib/XmHTML-1.1.0/src/libXmHTML.a
@@ -85,7 +86,7 @@ clean:
 	rm -f *.o *~ *.bak
 
 distclean: clean
-	rm -f $(TARGET) Makefile Makefile.bak config.h
+	rm -f $(TARGET) $(STATIC) Makefile Makefile.bak config.h
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 821ebe8a03..77107fc1f0 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -30,6 +30,7 @@ CC       = @CC@
 INCLPATH = -I/usr/include \
            -I.. \
            -I./register \
+           -I/usr/local/include \
            -I@x_includes@/. \
            -I@srcdir@/../include \
            -I@srcdir@/../lib/ComboBox-1.33 \
@@ -43,9 +44,9 @@ INCLPATH = -I/usr/include \
 CFLAGS   = @cflags@ -DCELL_WIDGETS=1
 LFLAGS   = @lflags@
 LIBS     = @LIBS@
-LIBPATH  = -L/lib -L/usr/lib -L@x_libraries@/.
-TARGET   = ../xacc
-STATIC   = ../xacc-static
+LIBPATH  = -L/lib -L/usr/lib -L/usr/local/lib -L@x_libraries@/.
+TARGET   = ../xacc.bin
+STATIC   = ../xacc-static.bin
 
 # LIBHTMLW = ../lib/libhtmlw/libhtmlw.a
 LIBXMHTML= ../lib/XmHTML-1.1.0/src/libXmHTML.a
@@ -85,6 +86,6 @@ clean:
 	rm -f *.o *~ *.bak
 
 distclean: clean
-	rm -f $(TARGET) Makefile Makefile.bak config.h
+	rm -f $(TARGET) $(STATIC) Makefile Makefile.bak config.h
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.