From 38046f33b2f1414d2dbd2b5654efe09ce9da5002 Mon Sep 17 00:00:00 2001 From: Linas Vepstas Date: Sat, 8 Aug 1998 02:53:11 +0000 Subject: [PATCH] remove makefiles, they're autogenerated by configure, and they keep causing conflicts in cvs for merging git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@945 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/Makefile | 67 --------------------------------------- src/engine/Makefile | 53 ------------------------------- src/gnome/Makefile | 74 ------------------------------------------- src/register/Makefile | 70 ---------------------------------------- 4 files changed, 264 deletions(-) delete mode 100644 src/Makefile delete mode 100644 src/engine/Makefile delete mode 100644 src/gnome/Makefile delete mode 100644 src/register/Makefile diff --git a/src/Makefile b/src/Makefile deleted file mode 100644 index 9e8ad7369c..0000000000 --- a/src/Makefile +++ /dev/null @@ -1,67 +0,0 @@ -# Generated automatically from Makefile.in by configure. -# Makefile -- makefile for xacc/src -# Copyright (C) 1997 Robin Clark -# Copyright (C) 1998 Rob Browning -# -# 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 - -# These three lines are suggested defs for autoconf (see the info pages). - -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} - - -###################################################################### -# See Makefile.common for information about these variables. -COMMON_SRCS := Ledger.c SplitLedger.c -CLEAN_SUBDIRS := engine gnome motif register qt -###################################################################### - -all: default - -# This inclusion must come after the first target, and after the -# definitions of *_SRCS, etc., but before the usage of *_OBJS. -include ../Makefile.common - -default: $(OBJS) - -motif: ${MOTIF_OBJS} - @cd engine; $(MAKE) default - @cd register; $(MAKE) motif - @cd motif; $(MAKE) motif - -gnome: ${GNOME_OBJS} - @cd engine; $(MAKE) default - @cd register; $(MAKE) gnome - @cd gnome; $(MAKE) gnome - -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 -# End: diff --git a/src/engine/Makefile b/src/engine/Makefile deleted file mode 100644 index 53c908bd89..0000000000 --- a/src/engine/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# Generated automatically from Makefile.in by configure. -# Makefile -- makefile for xacc/src/engine -# Copyright (C) 1997 Robin Clark -# Copyright (C) 1998 Linas Vepstas -# Copyright (C) 1998 Rob Browning -# -# 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 - -# These three lines are suggested defs for autoconf (see the info pages). - -srcdir = . - -CC = gcc -RANLIB = ranlib -INCLPATH = -I./../../include -I./../.. -CFLAGS = -O2 -Wall -g -Wall ${INCLPATH} - -###################################################################### -# See Makefile.common for information about these variables. -INDEP_SRCS := AccInfo.c Account.c DateUtils.c FileIO.c Group.c LedgerUtils.c \ - QIFIO.c Transaction.c TransLog.c date.c util.c -###################################################################### - -all: default - -# This inclusion must come after the first target, and after the -# definitions of *_SRCS, etc., but before the usage of *_OBJS. -include ../../Makefile.common - -default: ${OBJS} - -.PHONY: all default - -# Local Variables: -# tab-width: 2 -# End: diff --git a/src/gnome/Makefile b/src/gnome/Makefile deleted file mode 100644 index b668253fff..0000000000 --- a/src/gnome/Makefile +++ /dev/null @@ -1,74 +0,0 @@ -# Generated automatically from Makefile.in by configure. -# Makefile -- makefile for xacc/src/engine -# Copyright (C) 1997 Robin Clark -# Copyright (C) 1998 Linas Vepstas -# Copyright (C) 1998 Rob Browning -# -# 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 - -# These three lines are suggested defs for autoconf (see the info pages). - -prefix = /usr/local -srcdir = . -includedir=${prefix}/include - - -CC = gcc -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 -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 - - -TARGET = ../../xacc.gtk.bin -STATIC = ../../xacc-static.gtk.bin - -OTHER_OBJS := ../obj/gnome/*.o ../engine/obj/*.o ../register/obj/gnome/*.o - -###################################################################### -# See Makefile.common for information about these variables. -GNOME_SRCS := main.c MainWindow.c MenuBar.c RegWindow.c Add_Dialog.c xtutil.c \ - RecnWindow.c -# 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 -###################################################################### - -default: $(TARGET) - -# This inclusion must come after the first target, and after the -# definitions of *_SRCS, etc., but before the usage of *_OBJS. -include ../../Makefile.common - -gnome: default - -static: $(STATIC) - -$(TARGET): ${GNOME_OBJS} ${OTHER_OBJS} - $(CC) $(LDFLAGS) $(LIBS) -o $@ $^ - -$(STATIC): ${GNOME_OBJS} ${OTHER_OBJS} - $(CC) -static $(LDFLAGS) $(LIBS) -o $@ $^ diff --git a/src/register/Makefile b/src/register/Makefile deleted file mode 100644 index cd5d46d07f..0000000000 --- a/src/register/Makefile +++ /dev/null @@ -1,70 +0,0 @@ -# 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./../.. \ - -I./../../include \ - -I./../engine \ - -I./../../lib/ComboBox-1.33 \ - -I./../../lib/Xbae-4.6.2-linas \ - -I/usr/local/include - - -CFLAGS := -O2 -Wall -g -Wall -I/usr/X11R6/include -DCELL_WIDGETS=1 ${INCLPATH} - -###################################################################### -# See Makefile.common for information about these variables. -COMMON_SRCS := basiccell.c cellblock.c \ - datecell.c pricecell.c QuickFill.c quickfillcell.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: - @echo " " - @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 -# definitions of *_SRCS, etc., but before the usage of *_OBJS. -include ../../Makefile.common - -motif: ${MOTIF_OBJS} - -gnome: ${GNOME_OBJS} - -qt: $(QT_OBJS) - -.PHONY: all motif gnome - -# Local Variables: -# tab-width: 2 -# End: