new improved makefile stuff

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@604 57a11ea4-9604-0410-9ed3-97b8803252fd

Docs/projects.html

@@ -441,6 +441,11 @@ See also <a href="http://www.cs.hmc.edu/~rclark/xacc/merger.html">Merger</a>
     an industrial accounting package project.</a>
 <li><a href="http://www.dnaco.net/~bcooper/watermark/index.html">
     WaterMark</a> a Gnome/KDE personal finance package project. 
+    To see current watermark source, 
+    <pre>
+cvs -d :pserver:anonymous@im2.lcs.mit.edu:/im/magnus/cvsroot login
+cvs -d :pserver:anonymous@im2.lcs.mit.edu:/im/magnus/cvsroot get watermark
+    </pre>
 <li><a href="http://www.telly.org/freemoney/">FreeMoney</a> Linux
     small-business accounting s/w.
 <li><a href="http://gnomoney.ml.org/gnomoney/index.hts">GnoMoney</a>

Makefile

@@ -47,11 +47,17 @@ CPU     = @target_cpu@
 
 
 default:
+	echo "Please choose one of the following targets:"
+	echo "motif           dynamically linked motif version"
+	echo "motif-static    statically linked motif version"
+	echo "gnome           gnome/gtk version"
+
+motif:
 	@cd lib;    $(MAKE)
 	@cd src;    $(MAKE)
 
 # link in motif libs statically
-static:
+motif-static:
 	@cd lib;    $(MAKE)
 	@cd src;    $(MAKE) static
 

Makefile.in

@@ -47,11 +47,17 @@ CPU     = @target_cpu@
 
 
 default:
+	echo "Please choose one of the following targets:"
+	echo "motif           dynamically linked motif version"
+	echo "motif-static    statically linked motif version"
+	echo "gnome           gnome/gtk version"
+
+motif:
 	@cd lib;    $(MAKE)
 	@cd src;    $(MAKE)
 
 # link in motif libs statically
-static:
+motif-static:
 	@cd lib;    $(MAKE)
 	@cd src;    $(MAKE) static
 

src/Makefile

@@ -32,11 +32,13 @@ INCLPATH = -I/usr/include \
            -I./engine \
            -I./register \
            -I/usr/local/include \
-           -I./../include 
+           -I/usr/X11R6/include/. \
+           -I./../include \
 
-CFLAGS   = -g
-LFLAGS   = -g
 
+CFLAGS   = -O2 
+LFLAGS   = -O2
+LIBS     = -lXpm -lXm -lXmu -lXt -lXext  -lSM -lICE -lX11  -lpng -ljpeg -lz -lm
 
 ######################################################################
 SRCS = Ledger.c
@@ -48,7 +50,6 @@ default: $(OBJS)
 	@cd register;          $(MAKE) default
 	@cd motif;             $(MAKE) default
 
-
 .c.o:
 	@echo "+++"
 	$(CC) -c $(CFLAGS) $(INCLPATH) $<
@@ -59,13 +60,13 @@ depend:
 	@cd register;          $(MAKE) depend
 	@cd motif;             $(MAKE) depend
 
-
 clean:
 	rm -f *.o *~ *.bak
 	@cd engine;            $(MAKE) clean
 	@cd register;          $(MAKE) clean
 	@cd motif;             $(MAKE) clean
 
+
 distclean: clean
 	rm -f $(TARGET) $(STATIC) Makefile Makefile.bak config.h
 	@cd engine;            $(MAKE) distclean

src/engine/Makefile

@@ -2,8 +2,9 @@
 #
 ######################################################################
 #********************************************************************
-#* Makefile -- makefile for xacc/src                                *
+#* Makefile -- makefile for xacc/src/engine                         *
 #* Copyright (C) 1997 Robin Clark                                   *
+#* Copyright (C) 1998 Linas Vepstas                                 *
 #*                                                                  *
 #* This program is free software; you can redistribute it and/or    *
 #* modify it under the terms of the GNU General Public License as   *
@@ -33,9 +34,9 @@ INCLPATH = -I/usr/include \
            -I./../../include \
            -I./../..
 
-CFLAGS   = -g 
+CFLAGS   = -O2 
-LFLAGS   = -g
+LFLAGS   = -O2
-LIBS     = -lm
+LIBS     = -lXpm -lXm -lXmu -lXt -lXext  -lSM -lICE -lX11  -lpng -ljpeg -lz -lm
 LIBPATH  = -L/lib -L/usr/lib -L/usr/local/lib 
 TARGET   = ../libengine.a
 
@@ -63,6 +64,6 @@ clean:
 	rm -f *.o *~ *.bak
 
 distclean: clean
-	rm -f $(TARGET) $(STATIC) Makefile Makefile.bak config.h
+	rm -f $(TARGET) Makefile Makefile.bak config.h
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.

src/register/Makefile

@@ -1,17 +1,47 @@
+# Generated automatically from Makefile.in by configure.
+#
+######################################################################
+#********************************************************************
+#* Makefile -- makefile for xacc/src/register                       *
+#* Copyright (C) 1997 Robin Clark                                   *
+#* Copyright (C) 1998 Linas Vepstas                                 *
+#*                                                                  *
+#* This program is free software; you can redistribute it and/or    *
+#* modify it under the terms of the GNU General Public License as   *
+#* published by the Free Software Foundation; either version 2 of   *
+#* the License, or (at your option) any later version.              *
+#*                                                                  *
+#* This program is distributed in the hope that it will be useful,  *
+#* but WITHOUT ANY WARRANTY; without even the implied warranty of   *
+#* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
+#* GNU General Public License for more details.                     *
+#*                                                                  *
+#* You should have received a copy of the GNU General Public License*
+#* along with this program; if not, write to the Free Software      *
+#* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.        *
+#*                                                                  *
+#*   Author: Robin Clark                                            *
+#* Internet: rclark@rush.aero.org                                   *
+#*  Address: 609 8th Street                                         *
+#*           Huntington Beach, CA 92648-4632                        *
+#********************************************************************
 
 srcdir   = .
 CC       = gcc
 RANLIB   = ranlib
 INCLPATH = -I/usr/include \
+           -I/usr/local/include/. \
            -I/usr/X11R6/include/. \
-           -I./../.. \
+           -I./../..
            -I./../../include \
            -I./../engine \
            -I./../../lib/ComboBox-1.33 \
            -I./../../lib/Xbae-4.6.2-linas 
 
-CFLAGS   = -g -DCELL_WIDGETS=1
+CFLAGS   = -O2  -DCELL_WIDGETS=1
 LFLAGS   = -O2
+LIBS     = -lXpm -lXm -lXmu -lXt -lXext  -lSM -lICE -lX11  -lpng -ljpeg -lz -lm
+LIBPATH  = -L/lib -L/usr/lib -L/usr/local/lib 
 TARGET   = ../libregister.a
 
 ######################################################################

src/register/Makefile.in

@@ -38,8 +38,7 @@ INCLPATH = -I/usr/include \
            -I@srcdir@/../../lib/ComboBox-1.33 \
            -I@srcdir@/../../lib/Xbae-4.6.2-linas 
 
-# CFLAGS   = -g -DCELL_WIDGETS=1
+CFLAGS   = @cflags@  -DCELL_WIDGETS=1
-CFLAGS   = @cflags@ 
 LFLAGS   = @lflags@
 LIBS     = @LIBS@
 LIBPATH  = -L/lib -L/usr/lib -L/usr/local/lib