merge in changes from 1.0 branch

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@569 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Linas Vepstas 1998-03-01 17:19:43 +00:00
parent af012d802a
commit 5dfe0f5f21
2 changed files with 11 additions and 9 deletions

View File

@ -30,6 +30,7 @@ CC = gcc
INCLPATH = -I/usr/include \ INCLPATH = -I/usr/include \
-I.. \ -I.. \
-I./register \ -I./register \
-I/usr/local/include \
-I/usr/X11R6/include/. \ -I/usr/X11R6/include/. \
-I./../include \ -I./../include \
-I./../lib/ComboBox-1.33 \ -I./../lib/ComboBox-1.33 \
@ -41,11 +42,11 @@ INCLPATH = -I/usr/include \
# -I./../lib/libhtmlw # -I./../lib/libhtmlw
CFLAGS = -g -DCELL_WIDGETS=1 CFLAGS = -g -DCELL_WIDGETS=1
LFLAGS = -O2 LFLAGS = -g
LIBS = -lXpm -lXm -lXmu -lXt -lXext -lSM -lICE -lX11 -lpng -ljpeg -lz -lm LIBS = -lXpm -lXm -lXmu -lXt -lXext -lSM -lICE -lX11 -lpng -ljpeg -lz -lm
LIBPATH = -L/lib -L/usr/lib -L/usr/X11R6/lib/. LIBPATH = -L/lib -L/usr/lib -L/usr/local/lib -L/usr/X11R6/lib/.
TARGET = ../xacc TARGET = ../xacc.bin
STATIC = ../xacc-static STATIC = ../xacc-static.bin
# LIBHTMLW = ../lib/libhtmlw/libhtmlw.a # LIBHTMLW = ../lib/libhtmlw/libhtmlw.a
LIBXMHTML= ../lib/XmHTML-1.1.0/src/libXmHTML.a LIBXMHTML= ../lib/XmHTML-1.1.0/src/libXmHTML.a
@ -85,7 +86,7 @@ clean:
rm -f *.o *~ *.bak rm -f *.o *~ *.bak
distclean: clean 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. # DO NOT DELETE THIS LINE -- make depend depends on it.

View File

@ -30,6 +30,7 @@ CC = @CC@
INCLPATH = -I/usr/include \ INCLPATH = -I/usr/include \
-I.. \ -I.. \
-I./register \ -I./register \
-I/usr/local/include \
-I@x_includes@/. \ -I@x_includes@/. \
-I@srcdir@/../include \ -I@srcdir@/../include \
-I@srcdir@/../lib/ComboBox-1.33 \ -I@srcdir@/../lib/ComboBox-1.33 \
@ -43,9 +44,9 @@ INCLPATH = -I/usr/include \
CFLAGS = @cflags@ -DCELL_WIDGETS=1 CFLAGS = @cflags@ -DCELL_WIDGETS=1
LFLAGS = @lflags@ LFLAGS = @lflags@
LIBS = @LIBS@ LIBS = @LIBS@
LIBPATH = -L/lib -L/usr/lib -L@x_libraries@/. LIBPATH = -L/lib -L/usr/lib -L/usr/local/lib -L@x_libraries@/.
TARGET = ../xacc TARGET = ../xacc.bin
STATIC = ../xacc-static STATIC = ../xacc-static.bin
# LIBHTMLW = ../lib/libhtmlw/libhtmlw.a # LIBHTMLW = ../lib/libhtmlw/libhtmlw.a
LIBXMHTML= ../lib/XmHTML-1.1.0/src/libXmHTML.a LIBXMHTML= ../lib/XmHTML-1.1.0/src/libXmHTML.a
@ -85,6 +86,6 @@ clean:
rm -f *.o *~ *.bak rm -f *.o *~ *.bak
distclean: clean 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. # DO NOT DELETE THIS LINE -- make depend depends on it.