mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
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:
parent
af012d802a
commit
5dfe0f5f21
11
src/Makefile
11
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.
|
||||
|
||||
|
@ -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.
|
||||
|
Loading…
Reference in New Issue
Block a user