more makefile fixes for gtk targets

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@617 57a11ea4-9604-0410-9ed3-97b8803252fd
2025-02-25 18:55:30 -06:00 · 1998-03-09 01:27:59 +00:00 · 1998-03-09 01:27:59 +00:00 · ffb43cbc8a
commit ffb43cbc8a
parent fda7637400
10 changed files with 79 additions and 41 deletions
--- a/18
+++ b/18
@ -47,19 +47,25 @@ 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"
+	@echo " "
+	@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"
+	@echo " "

 motif:
 	@cd lib;    $(MAKE)
-	@cd src;    $(MAKE)
+	@cd src;    $(MAKE) motif

 # link in motif libs statically
 motif-static:
 	@cd lib;    $(MAKE)
-	@cd src;    $(MAKE) static
+	@cd src;    $(MAKE) motif-static
+
+gnome:
+	@cd lib;    $(MAKE)
+	@cd src;    $(MAKE) gnome

 depend:
 	@cd lib;    $(MAKE) depend
--- a/Makefile.in
+++ b/Makefile.in
@ -47,19 +47,25 @@ 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"
+	@echo " "
+	@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"
+	@echo " "

 motif:
 	@cd lib;    $(MAKE)
-	@cd src;    $(MAKE)
+	@cd src;    $(MAKE) motif

 # link in motif libs statically
 motif-static:
 	@cd lib;    $(MAKE)
-	@cd src;    $(MAKE) static
+	@cd src;    $(MAKE) motif-static
+
+gnome:
+	@cd lib;    $(MAKE)
+	@cd src;    $(MAKE) gnome

 depend:
 	@cd lib;    $(MAKE) depend
--- a/4
+++ b/4
@ -2198,7 +2198,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"

-trap 'rm -fr `echo "xacc Makefile src/Makefile src/engine/Makefile src/motif/Makefile src/register/Makefile lib/Makefile lib/XmHTML-1.1.0/Makefile lib/XmHTML-1.1.0/src/Makefile lib/Xbae-4.6.2-linas/Makefile lib/Xbae-4.6.2-linas/src/Makefile lib/ComboBox-1.33/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "xacc Makefile src/Makefile src/engine/Makefile src/gtk/Makefile src/motif/Makefile src/register/Makefile lib/Makefile lib/XmHTML-1.1.0/Makefile lib/XmHTML-1.1.0/src/Makefile lib/Xbae-4.6.2-linas/Makefile lib/Xbae-4.6.2-linas/src/Makefile lib/ComboBox-1.33/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF

@ -2283,7 +2283,7 @@ EOF

 cat >> $CONFIG_STATUS <<EOF

-CONFIG_FILES=\${CONFIG_FILES-"xacc Makefile src/Makefile src/engine/Makefile src/motif/Makefile src/register/Makefile lib/Makefile lib/XmHTML-1.1.0/Makefile lib/XmHTML-1.1.0/src/Makefile lib/Xbae-4.6.2-linas/Makefile lib/Xbae-4.6.2-linas/src/Makefile lib/ComboBox-1.33/Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"xacc Makefile src/Makefile src/engine/Makefile src/gtk/Makefile src/motif/Makefile src/register/Makefile lib/Makefile lib/XmHTML-1.1.0/Makefile lib/XmHTML-1.1.0/src/Makefile lib/Xbae-4.6.2-linas/Makefile lib/Xbae-4.6.2-linas/src/Makefile lib/ComboBox-1.33/Makefile"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
--- a/configure.in
+++ b/configure.in
@ -77,7 +77,7 @@ AC_SUBST(LIBS)
 # *******************************************
 AC_CONFIG_HEADER(config.h)

-AC_OUTPUT(xacc Makefile src/Makefile src/engine/Makefile src/motif/Makefile src/register/Makefile lib/Makefile lib/XmHTML-1.1.0/Makefile lib/XmHTML-1.1.0/src/Makefile lib/Xbae-4.6.2-linas/Makefile lib/Xbae-4.6.2-linas/src/Makefile lib/ComboBox-1.33/Makefile)
+AC_OUTPUT(xacc Makefile src/Makefile src/engine/Makefile src/gtk/Makefile src/motif/Makefile src/register/Makefile lib/Makefile lib/XmHTML-1.1.0/Makefile lib/XmHTML-1.1.0/src/Makefile lib/Xbae-4.6.2-linas/Makefile lib/Xbae-4.6.2-linas/src/Makefile lib/ComboBox-1.33/Makefile)

 chmod +x xacc

--- a/src/Makefile
+++ b/src/Makefile
@ -46,9 +46,16 @@ OBJS = ${SRCS:.c=.o}
 ######################################################################

 default: $(OBJS)
+
+motif: default
 	@cd engine;            $(MAKE) default
-	@cd register;          $(MAKE) default
-	@cd motif;             $(MAKE) default
+	@cd register;          $(MAKE) motif
+	@cd motif;             $(MAKE) motif
+
+gnome: default
+	@cd engine;            $(MAKE) default
+	@cd register;          $(MAKE) gnome
+	@cd gtk;               $(MAKE) gnome

 .c.o:
 	@echo "+++"
--- a/src/Makefile.in
+++ b/src/Makefile.in
@ -46,9 +46,16 @@ OBJS = ${SRCS:.c=.o}
 ######################################################################

 default: $(OBJS)
+
+motif: default
 	@cd engine;            $(MAKE) default
-	@cd register;          $(MAKE) default
-	@cd motif;             $(MAKE) default
+	@cd register;          $(MAKE) motif
+	@cd motif;             $(MAKE) motif
+
+gnome: default
+	@cd engine;            $(MAKE) default
+	@cd register;          $(MAKE) gnome
+	@cd gtk;               $(MAKE) gnome

 .c.o:
 	@echo "+++"
--- a/src/gnome/Makefile
+++ b/src/gnome/Makefile
@ -30,35 +30,40 @@ CC       = gcc
 INCLPATH = -I/usr/include \
           -I.. \
           -I../.. \
-           -I../../include \
           -I../engine \
           -I../register \
           -I/usr/local/include \
           -I/usr/X11R6/include/. \
           -I./../../include 

+# libhtmlw eliminated due to license restrictions 
+# and general brokenness
+#           -I./../../lib/libhtmlw 

-CFLAGS   = -g 
-LFLAGS   = -g
-LIBS     = -lXpm -lgtk -lgdk -lglib -lXext -lXmu -lXt -lXext  -lSM -lICE -lX11  -lpng -ljpeg -lz -lm
+CFLAGS   = -O2
+LFLAGS   = -O2
+# LIBS     = -lXpm -lXm -lXmu -lXt -lXext  -lSM -lICE -lX11  -lpng -ljpeg -lz -lm
+LIBS     = -lgtk -lgdk -lglib -lXpm -lXext -lXmu -lXt -lXext  -lSM -lICE -lX11  -lpng -ljpeg -lz -lm
 LIBPATH  = -L/lib -L/usr/lib -L/usr/local/lib -L/usr/X11R6/lib/.
 TARGET   = ../../xacc.gtk.bin

-#LIBREG   = ../libregister.a
+LIBREG   = ../libregister.a
 LIBENG   = ../libengine.a
 ######################################################################
 SRCS = main.c MainWindow.c MenuBar.c 

-#SRCS = AccWindow.c AccountMenu.c AdjBWindow.c    \
-#       BuildMenu.c Destroy.c FileBox.c HelpWindow.c MainWindow.c  \
-#       RecnWindow.c RegWindow.c Reports.c TextBox.c  \
-#       XferWindow.c main.c  xtutil.c
-#OBJS = ${SRCS:.c=.o} $(LIBENG) ../Ledger.o 
+# SRCS = AccWindow.c AccountMenu.c AdjBWindow.c    \
+#        BuildMenu.c Destroy.c FileBox.c HelpWindow.c  \
+#        RecnWindow.c RegWindow.c Reports.c TextBox.c  \
+#        XferWindow.c date.c xtutil.c
+# OBJS = ${SRCS:.c=.o} $(LIBENG) $(LIBREG) ../Ledger.o 
 OBJS = ${SRCS:.c=.o} $(LIBENG)  
 ######################################################################

 default: $(TARGET)

+gnome: default
+
 $(TARGET): $(OBJS)
 	@echo "++++++"
 	$(CC) $(LFLAGS) $(OBJS) $(LIBPATH) $(LIBS) -o $@
--- a/src/gnome/Makefile.in
+++ b/src/gnome/Makefile.in
@ -42,10 +42,10 @@ INCLPATH = -I/usr/include \

 CFLAGS   = @cflags@
 LFLAGS   = @lflags@
-LIBS     = @LIBS@
+# LIBS     = @LIBS@
+LIBS     = -lgtk -lgdk -lglib -lXpm -lXext -lXmu -lXt -lXext  -lSM -lICE -lX11  -lpng -ljpeg -lz -lm
 LIBPATH  = -L/lib -L/usr/lib -L/usr/local/lib -L@x_libraries@/.
 TARGET   = ../../xacc.gtk.bin
-STATIC   = ../../xacc-static.bin

 LIBREG   = ../libregister.a
 LIBENG   = ../libengine.a
@ -53,14 +53,17 @@ LIBENG   = ../libengine.a
 SRCS = main.c MainWindow.c MenuBar.c 

 # SRCS = AccWindow.c AccountMenu.c AdjBWindow.c    \
-#        BuildMenu.c Destroy.c FileBox.c HelpWindow.c MainWindow.c   \
+#        BuildMenu.c Destroy.c FileBox.c HelpWindow.c  \
 #        RecnWindow.c RegWindow.c Reports.c TextBox.c  \
-#        XferWindow.c date.c main.c xtutil.c
-OBJS = ${SRCS:.c=.o} $(LIBENG) $(LIBREG) ../Ledger.o 
+#        XferWindow.c date.c xtutil.c
+# OBJS = ${SRCS:.c=.o} $(LIBENG) $(LIBREG) ../Ledger.o 
+OBJS = ${SRCS:.c=.o} $(LIBENG)  
 ######################################################################

 default: $(TARGET)

+gnome: default
+
 $(TARGET): $(OBJS)
 	@echo "++++++"
 	$(CC) $(LFLAGS) $(OBJS) $(LIBPATH) $(LIBS) -o $@
--- a/src/register/Makefile
+++ b/src/register/Makefile
@ -32,7 +32,7 @@ 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 \
@ -51,7 +51,9 @@ SRCS = 	basiccell.c cellblock.c combocell.c \
 OBJS = ${SRCS:.c=.o} 
 ######################################################################

-default: $(TARGET)
+motif: $(TARGET)
+
+gnome: $(TARGET)

 $(TARGET): $(OBJS)
 	@echo "++++++"
--- a/src/register/Makefile.in
+++ b/src/register/Makefile.in
@ -32,7 +32,7 @@ RANLIB   = @RANLIB@
 INCLPATH = -I/usr/include \
           -I/usr/local/include/. \
           -I/usr/X11R6/include/. \
-           -I@srcdir@/../..
+           -I@srcdir@/../.. \
           -I@srcdir@/../../include \
           -I@srcdir@/../engine \
           -I@srcdir@/../../lib/ComboBox-1.33 \
@ -51,7 +51,9 @@ SRCS = 	basiccell.c cellblock.c combocell.c \
 OBJS = ${SRCS:.c=.o} 
 ######################################################################

-default: $(TARGET)
+motif: $(TARGET)
+
+gnome: $(TARGET)

 $(TARGET): $(OBJS)
 	@echo "++++++"