Updated Makefiles to build into separate dist/classes directory. jrg

2025-01-31 19:10:36 +00:00 · 2001-03-28 02:24:29 +00:00 · 2001-03-28 02:24:29 +00:00 · 331c22e5e2
commit 331c22e5e2
parent 642b2fe516
31 changed files with 73 additions and 64 deletions
--- a/grendel/Makefile
+++ b/grendel/Makefile
@ -21,35 +21,23 @@
 #               Edwin Woudt <edwin@woudt.nl>
 #

+TOPDIR=.
+
 SUBDIRS=		\
-	addressbook	\
-	calypso		\
-	composition	\
-	dnd		\
-	dog		\
-	mime		\
-	prefs		\
-	search		\
-	storage		\
-	ui		\
-	util		\
-	view		\
-	widgets		\
+	sources		\
 	$(NULL)

-# Temporarily removed because FilterMaster is broken (edwin)
-#	filters		\
-
-SRCS=				\
-	Main.java		\
-	$(NULL)
-
-#	TestFolderViewer.java	\
-#	SelfTest.java		\
-

 include rules.mk

+JARDIR=dist/classes
+jar::
+	@echo Creating jarfile...;	\
+	cd $(JARDIR) ; jar cvfm manifest Grendel.jar calypso dog grendel
+
+clean::
+	cd $(JARDIR) ;	rm -rf calypso dog grendel
+
 TARFILE=/tmp/grendel.tar.gz
 tar::
 	@echo writing $(TARFILE)... ;			\
--- a/grendel/rules.mk
+++ b/grendel/rules.mk
@ -39,23 +39,17 @@ MOZILLA_HOME = /usr/local/netscape-4.5
 JAVAC	= javac

 RM	= rm -f
+DISTDIR = $(TOPDIR)/dist/classes

 OBJS	= $(subst .java,.class,$(SRCS))

 .SUFFIXES: .java .class

 .java.class:
-	$(JAVAC) -J-mx64m -g $*.java
+	$(JAVAC) -J-mx64m -d $(DISTDIR) -g $*.java

 all:: $(OBJS)

-
-#clean::
-#	$(RM) $(OBJS)
-
-clean::
-	$(RM) *.class
-
 distclean::
 	$(RM) *.class *~ core

--- a/grendel/sources/calypso/Makefile
+++ b/grendel/sources/calypso/Makefile
@ -19,8 +19,9 @@
 #
 # Contributor(s): 

+TOPDIR=../..
 SUBDIRS=	\
 	util	\
 	$(NULL)

-include ../rules.mk
+include ../../rules.mk
--- a/grendel/sources/calypso/util/Makefile
+++ b/grendel/sources/calypso/util/Makefile
@ -19,6 +19,7 @@
 #
 # Contributor(s): 

+TOPDIR=../../..
 SRCS=						\
 	Abacus.java				\
 	ArrayEnumeration.java			\
@ -83,4 +84,4 @@ SRCS=						\
 	WeakLinkArrayEnumeration.java		\
 	$(NULL)

-include ../../rules.mk
+include ../../../rules.mk
--- a/grendel/sources/dog/Makefile
+++ b/grendel/sources/dog/Makefile
@ -19,9 +19,10 @@
 #
 # Contributor(s): 

+TOPDIR=../..
 SUBDIRS=		\
 	mail		\
 	util		\
 	$(NULL)

-include ../rules.mk
+include ../../rules.mk
--- a/grendel/sources/dog/mail/Makefile
+++ b/grendel/sources/dog/mail/Makefile
@ -19,9 +19,11 @@
 #
 # Contributor(s): 

+TOPDIR=../../..
+
 SUBDIRS=		\
 	nntp		\
 	util		\
 	$(NULL)

-include ../../rules.mk
+include ../../../rules.mk
--- a/grendel/sources/dog/mail/nntp/Makefile
+++ b/grendel/sources/dog/mail/nntp/Makefile
@ -19,10 +19,11 @@
 #
 # Contributor(s): 

+TOPDIR=../../../..
 SRCS=				\
 	Article.java		\
 	NNTPStore.java		\
 	Newsgroup.java		\
 	$(NULL)

-include ../../../rules.mk
+include ../../../../rules.mk
--- a/grendel/sources/dog/mail/util/Makefile
+++ b/grendel/sources/dog/mail/util/Makefile
@ -19,6 +19,7 @@
 #
 # Contributor(s): 

+TOPDIR=../../../..
 SRCS=					\
 	CRLFInputStream.java		\
 	CRLFOutputStream.java		\
@ -26,4 +27,4 @@ SRCS=					\
 	MessageOutputStream.java	\
 	$(NULL)

-include ../../../rules.mk
+include ../../../../rules.mk
--- a/grendel/sources/dog/util/Makefile
+++ b/grendel/sources/dog/util/Makefile
@ -19,6 +19,7 @@
 #
 # Contributor(s): 

+TOPDIR=../../..
 SRCS=				\
 	ObjectCollator.java	\
 	Referential.java	\
@ -33,4 +34,4 @@ SRCS=				\
 	TreeEvent.java		\
 	$(NULL)

-include ../../rules.mk
+include ../../../rules.mk
--- a/grendel/sources/grendel/addressbook/Makefile
+++ b/grendel/sources/grendel/addressbook/Makefile
@ -20,7 +20,7 @@
 # Contributor(s): Jeff Galyan <talisman@anamorphic.com>
 #               Giao Nguyen <grail@cafebabe.org>

-TOPDIR = ..
+TOPDIR = ../../..

 SUBDIRS=			\
 	addresscard		\
@ -32,4 +32,4 @@ SRCS=				\
 	SearchDirectoryDialog.java	\
 	$(NULL)

-include ../rules.mk
+include ../../..rules.mk
--- a/grendel/sources/grendel/addressbook/addresscard/Makefile
+++ b/grendel/sources/grendel/addressbook/addresscard/Makefile
@ -19,7 +19,7 @@
 #
 # Contributor(s): 

-TOPDIR = ../..
+TOPDIR = ../../../..

 SRCS=				\
 	ACS_Personal.java	\
@ -47,4 +47,4 @@ SRCS=				\
 	TermOr.java		\
 	$(NULL)

-include ../../rules.mk
+include ../../../../rules.mk
--- a/grendel/sources/grendel/composition/Makefile
+++ b/grendel/sources/grendel/composition/Makefile
@ -18,7 +18,8 @@
 # Rights Reserved.
 #
 # Contributor(s): Giao Nguyen <grail@cafebabe.org>
- 
+
+TOPDIR=../../.. 
 SRCS=					\
 	AddressBar.java			\
 	AddressDialog.java		\
@ -36,4 +37,4 @@ SRCS=					\
 	# TestDataSource2.java		\
 	$(NULL)

-include ../rules.mk
+include ../../../rules.mk
--- a/grendel/sources/grendel/dnd/Makefile
+++ b/grendel/sources/grendel/dnd/Makefile
@ -19,6 +19,7 @@
 #
 # Contributor(s): 

+TOPDIR=../../..
 SRCS=						\
 	DnDConstants.java			\
 	DragSource.java				\
@ -36,4 +37,4 @@ SRCS=						\
 	InvalidDnDOperationException.java	\
 	$(NULL)

-include ../rules.mk
+include ../../../rules.mk
--- a/grendel/sources/grendel/filters/Makefile
+++ b/grendel/sources/grendel/filters/Makefile
@ -19,6 +19,7 @@
 #
 # Contributor(s): 

+TOPDIR=../../..
 SRCS=					\
 	DeleteFilterActionFactory.java	\
 	FilterBase.java			\
@ -34,4 +35,4 @@ SRCS=					\
 	SubjectTermFactory.java		\
 	$(NULL)

-include ../rules.mk
+include ../../../rules.mk
--- a/grendel/sources/grendel/integrator/Makefile
+++ b/grendel/sources/grendel/integrator/Makefile
@ -19,6 +19,7 @@
 #
 # Contributor(s): 

+TOPDIR=../../..
 SRCS=				\
 	CompositionShell.java	\
 	CompositionView.java	\
@ -29,4 +30,4 @@ SRCS=				\
 	StoreCtx.java		\
 	$(NULL)

-include ../rules.mk
+include ../../../rules.mk
--- a/grendel/sources/grendel/mime/Makefile
+++ b/grendel/sources/grendel/mime/Makefile
@ -19,6 +19,7 @@
 #
 # Contributor(s): 

+TOPDIR=../../..
 SUBDIRS=				\
 	html				\
 	parser				\
@ -34,4 +35,4 @@ SRCS=					\
 	TestMime.java			\
 	$(NULL)

-include ../rules.mk
+include ../../../rules.mk
--- a/grendel/sources/grendel/mime/encoder/Makefile
+++ b/grendel/sources/grendel/mime/encoder/Makefile
@ -19,6 +19,7 @@
 #
 # Contributor(s): 

+TOPDIR=../../../..
 SRCS=					\
 	MimeBase64Decoder.java		\
 	MimeBase64Encoder.java		\
@ -29,4 +30,4 @@ SRCS=					\
 	MimeUUEncoder.java		\
 	$(NULL)

-include ../../rules.mk
+include ../../../../rules.mk
--- a/grendel/sources/grendel/mime/extractor/Makefile
+++ b/grendel/sources/grendel/mime/extractor/Makefile
@ -19,8 +19,9 @@
 #
 # Contributor(s): 

+TOPDIR=../../../..
 SRCS=						\
 	MimeExtractorOperatorFactory.java	\
 	$(NULL)

-include ../../rules.mk
+include ../../../../rules.mk
--- a/grendel/sources/grendel/mime/html/Makefile
+++ b/grendel/sources/grendel/mime/html/Makefile
@ -19,6 +19,7 @@
 #
 # Contributor(s): 

+TOPDIR=../../../..
 SRCS=						\
 	BriefHeaderFormatter.java		\
 	FullHeaderFormatter.java		\
@ -43,4 +44,4 @@ SRCS=						\
 	TextHTMLConverter.java			\
 	$(NULL)

-include ../../rules.mk
+include ../../../../rules.mk
--- a/grendel/sources/grendel/mime/parser/Makefile
+++ b/grendel/sources/grendel/mime/parser/Makefile
@ -19,6 +19,7 @@
 #
 # Contributor(s): 

+TOPDIR=../../../..
 SRCS=					\
 	MimeContainer.java		\
 	MimeDwimText.java		\
@ -32,4 +33,4 @@ SRCS=					\
 	MimeXSunAttachment.java		\
 	$(NULL)

-include ../../rules.mk
+include ../../../../rules.mk
--- a/grendel/sources/grendel/prefs/Makefile
+++ b/grendel/sources/grendel/prefs/Makefile
@ -20,10 +20,11 @@
 # Contributor(s): Giao Nguyen <grail@cafebabe.org>
 #               Edwin Woudt <edwin@woudt.nl>

+TOPDIR=../../..
 SUBDIRS=		\
 	base	\
 	ui \
 	$(NULL)


-include ../rules.mk
+include ../../../rules.mk
--- a/grendel/sources/grendel/prefs/base/Makefile
+++ b/grendel/sources/grendel/prefs/base/Makefile
@ -19,6 +19,7 @@
 #
 # Contributor(s): Giao Nguyen <grail@cafebabe.org>

+TOPDIR=../../../..
 SRCS=                     \
  GeneralPrefs.java       \
  IdentityArray.java      \
@ -29,4 +30,4 @@ SRCS=                     \
  UIPrefs.java            \
 	$(NULL)

-include ../../rules.mk
+include ../../../../rules.mk
--- a/grendel/sources/grendel/prefs/ui/Makefile
+++ b/grendel/sources/grendel/prefs/ui/Makefile
@ -19,6 +19,7 @@
 #
 # Contributor(s): Giao Nguyen <grail@cafebabe.org>

+TOPDIR=../../../..
 SRCS=               \
  General.java      \
 	Identities.java   \
@ -26,4 +27,4 @@ SRCS=               \
 	UI.java           \
 	$(NULL)

-include ../../rules.mk
+include ../../../../rules.mk
--- a/grendel/sources/grendel/search/Makefile
+++ b/grendel/sources/grendel/search/Makefile
@ -19,6 +19,7 @@
 #
 # Contributor(s): 

+TOPDIR=../../..
 SRCS=				\
 	AndPanel.java		\
 	AttributeLayout.java	\
@ -37,4 +38,4 @@ SRCS=				\
 	TermPanel.java		\
 	$(NULL)

-include ../rules.mk
+include ../../../rules.mk
--- a/grendel/sources/grendel/storage/Makefile
+++ b/grendel/sources/grendel/storage/Makefile
@ -19,6 +19,7 @@
 #
 # Contributor(s): Edwin Woudt <edwin@woudt.nl>

+TOPDIR=../../..
 SUBDIRS=					\
 	addressparser				\
 	intertwingle				\
@ -76,4 +77,4 @@ SRCS=						\
 #	SelfTest.java				\


-include ../rules.mk
+include ../../../rules.mk
--- a/grendel/sources/grendel/storage/addressparser/Makefile
+++ b/grendel/sources/grendel/storage/addressparser/Makefile
@ -19,6 +19,7 @@
 #
 # Contributor(s): 

+TOPDIR=../../../..
 SRCS=					\
 	AddressCorrector.java		\
 	AddressToken.java		\
@ -37,4 +38,4 @@ SRCS=					\
 	RouteAddrNoPhraseException.java	\
 	$(NULL)

-include ../../rules.mk
+include ../../../../rules.mk
--- a/grendel/sources/grendel/storage/intertwingle/Makefile
+++ b/grendel/sources/grendel/storage/intertwingle/Makefile
@ -19,6 +19,7 @@
 #
 # Contributor(s): 

+TOPDIR=../../../..
 SRCS=			\
 	BGDB.java	\
 	BaseDB.java	\
@ -31,4 +32,4 @@ SRCS=			\
 	Twingle.java	\
 	$(NULL)

-include ../../rules.mk
+include ../../../../rules.mk
--- a/grendel/sources/grendel/ui/Makefile
+++ b/grendel/sources/grendel/ui/Makefile
@ -20,6 +20,7 @@
 # Contributor(s): Jeff Galyan <talisman@anamorphic.com>
 #               Giao Nguyen <grail@cafebabe.org>

+TOPDIR=../../..
 SRCS=						\
 	ActionFactory.java			\
 	BiffIcon.java				\
@ -64,4 +65,4 @@ SRCS=						\
 	XMLWidgetBuilder.java			\
 	$(NULL)

-include ../rules.mk
+include ../../../rules.mk
--- a/grendel/sources/grendel/util/Makefile
+++ b/grendel/sources/grendel/util/Makefile
@ -19,10 +19,10 @@
 #
 # Contributor(s): Edwin Woudt <edwin@woudt.nl>

-
+TOPDIR=../../..
 SRCS=					\
 	Constants.java			\
 	MessageIDGenerator.java		\
 	$(NULL)

-include ../rules.mk
+include ../../../rules.mk
--- a/grendel/sources/grendel/view/Makefile
+++ b/grendel/sources/grendel/view/Makefile
@ -19,6 +19,7 @@
 #
 # Contributor(s): 

+TOPDIR=../../..
 SRCS=					\
 	DummyThreadable.java		\
 	FolderView.java			\
@ -41,4 +42,4 @@ SRCS=					\
 	ViewedStoreListener.java	\
 	$(NULL)

-include ../rules.mk
+include ../../../rules.mk
--- a/grendel/sources/grendel/widgets/Makefile
+++ b/grendel/sources/grendel/widgets/Makefile
@ -19,6 +19,7 @@
 #
 # Contributor(s): Jeff Galyan <talisman@anamorphic.com>

+TOPDIR=../../..
 SRCS=					\
 	Animation.java			\
 	CellEditor.java			\
@ -55,4 +56,4 @@ SRCS=					\
 	TreeTableModelListener.java	\
 	$(NULL)

-include ../rules.mk
+include ../../../rules.mk