From 0e86bc3694602f3e851d0d7cec26a33a8ec9bce9 Mon Sep 17 00:00:00 2001 From: Linas Vepstas Date: Fri, 7 Aug 1998 05:04:57 +0000 Subject: [PATCH] configure picked up qt changes git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@936 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/Makefile | 11 ++++++++--- src/engine/Makefile | 2 +- src/gnome/Makefile | 4 ++-- src/register/Makefile | 6 +++++- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/Makefile b/src/Makefile index 763611264a..84f43e3b5a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -28,13 +28,13 @@ srcdir = . CC = gcc INCLPATH = -I.. -I./engine -I./register -I./../include -I/usr/local/include -CFLAGS = -O2 -Wall -g -Wall -I/usr/X11R6/include ${INCLPATH} +CFLAGS = -O2 -Wall -I/usr/X11R6/include ${INCLPATH} ###################################################################### # See Makefile.common for information about these variables. COMMON_SRCS := Ledger.c SplitLedger.c -CLEAN_SUBDIRS := engine gnome motif register +CLEAN_SUBDIRS := engine gnome motif register qt ###################################################################### all: default @@ -55,7 +55,12 @@ gnome: ${GNOME_OBJS} @cd register; $(MAKE) gnome @cd gnome; $(MAKE) gnome -.PHONY: default gnome motif all +qt: $(QT_OBJS) + @cd engine; $(MAKE) default + @cd register; $(MAKE) qt + @cd qt; $(MAKE) qt + +.PHONY: default qt gnome motif all # Local Variables: # tab-width: 2 diff --git a/src/engine/Makefile b/src/engine/Makefile index 53c908bd89..0526eda293 100644 --- a/src/engine/Makefile +++ b/src/engine/Makefile @@ -30,7 +30,7 @@ srcdir = . CC = gcc RANLIB = ranlib INCLPATH = -I./../../include -I./../.. -CFLAGS = -O2 -Wall -g -Wall ${INCLPATH} +CFLAGS = -O2 -Wall ${INCLPATH} ###################################################################### # See Makefile.common for information about these variables. diff --git a/src/gnome/Makefile b/src/gnome/Makefile index b668253fff..1693deeef9 100644 --- a/src/gnome/Makefile +++ b/src/gnome/Makefile @@ -35,8 +35,8 @@ INCLPATH = -I.. -I../.. -I../engine -I../register -I./../../include \ -I$(includedir) -I$(prefix)/lib/gnome-libs/include -CFLAGS = -O2 -Wall -g -Wall -I/usr/X11R6/include ${INCLPATH} -LDFLAGS = -g -Wall +CFLAGS = -O2 -Wall -I/usr/X11R6/include ${INCLPATH} +LDFLAGS = LIBS = -L$(prefix)/lib -lpng -ljpeg -lz -lm -lSM -lICE -lXpm -L/usr/X11R6/lib \ $(shell gtk-config --libs) -lgnomeui -lgnome \ -lgnomesupport -lintl -lgdk_imlib -ltiff diff --git a/src/register/Makefile b/src/register/Makefile index a2edfade1d..664d641c5b 100644 --- a/src/register/Makefile +++ b/src/register/Makefile @@ -33,7 +33,7 @@ INCLPATH = -I./../.. \ -I/usr/local/include -CFLAGS := -O2 -Wall -g -Wall -I/usr/X11R6/include -DCELL_WIDGETS=1 ${INCLPATH} +CFLAGS := -O2 -Wall -I/usr/X11R6/include -DCELL_WIDGETS=1 ${INCLPATH} ###################################################################### # See Makefile.common for information about these variables. @@ -42,6 +42,7 @@ COMMON_SRCS := basiccell.c cellblock.c \ recncell.c register.c splitreg.c table-allgui.c textcell.c MOTIF_SRCS := table-motif.c combocell-motif.c GNOME_SRCS := table-gtk.c combocell-gtk.c +QT_SRCS := ###################################################################### all: @@ -49,6 +50,7 @@ all: @echo "Please choose one of the following targets:" @echo "motif dynamically linked motif version" @echo "gnome gnome/gtk version" + @echo "qt kde/qt version" @echo " " # This inclusion must come after the first target, and after the @@ -59,6 +61,8 @@ motif: ${MOTIF_OBJS} gnome: ${GNOME_OBJS} +qt: $(QT_OBJS) + .PHONY: all motif gnome # Local Variables: