ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/COMP/SCRAM/src/basics.mk

Comparing COMP/SCRAM/src/basics.mk (file contents):
Revision 1.17.2.6 by williamc, Tue Sep 14 11:51:09 1999 UTC vs.
Revision 1.17.2.11 by williamc, Tue Oct 5 16:27:40 1999 UTC

#	Line 1 | Line 1
1		#
2		# Preliminaries
3		#
4	<	LIBDIR:=$(LOCALTOP)/lib/$(SCRAM_ARCH) $(RELEASETOP)/lib/$(SCRAM_ARCH)
4	>	LIBDIR=$(LOCALTOP)/lib/$(SCRAM_ARCH) $(RELEASETOP)/lib/$(SCRAM_ARCH) $(PRIORITY_LIBDIR)
5
6	<	CXXFLAGS+=CXXUSERFLAGS
6	>	CXXFLAGS+=$(CXXUSERFLAGS)
7
8		#
9		# Make sure nobody tries to run this directly through gmake
#	Line 12 | Line 12 | ifndef DefaultMakefile
12		all: exit
13		endif
14
15	+
16		# -- storage of libraries
17		librarystore:=$(LOCALTOP)/$(INTlib)
18
#	Line 37 | Line 38 | $(LOCALTOP)/$(workdir)/PackageReqs:$(Req
38		$(TOOL_HOME)/BuildPackageReqs $@ $?
39		endif
40
41	+
42		#
43		# Get local mods
44		#
#	Line 67 | Line 69 | include ${TOOL_HOME}/toolrules.mk
69		#
70		# -- Some tool setups which dont yet have a home
71		#
72	<	CPPFLAGS += $(INCLUDEPATH)
72	>	CPPFLAGS += $(addprefix -I,$(PRIORITY_INCLUDE)) $(INCLUDEPATH)
73
74
75		#
#	Line 80 | Line 82 | INCLUDEPATH+=-I$(LOCALTOP)/${INTsrc} -I$
82		#
83		-include dependencies.mk
84
85	+	#dependencies.mk :: $(clientmakefile)
86		#
87		# Process Subdirs
88		#
#	Line 92 | Line 95 | $(SUBDIRS)::
95		fi
96		endif
97
95	–	#
96	–	# clientmakefile creation
97	–	#
98	–	$(clientmakefile): $(LOCALTOP)/.SCRAM/${SCRAM_ARCH}/clientsettings $(LOCALTOP)/.SCRAM/${SCRAM_ARCH}/clientsettings_reqs $(projdeps) $(TOOL_HOME)/ProcessSiteFile
99	–	@$(TOOL_HOME)/ProcessSiteFile $< $@ $(projdeps)
98
99		HELPINCLUDEMAKEFILES := ${DefaultBuildFile} ${TOOL_HOME}/toolrules.mk
100
#	Line 153 | Line 151 | very_clean:
151		@cd $(LOCALTOP)/$(INTwork)
152		ifdef LOCALTOP
153		ifdef workdir
154	<	@rm -rf $(LOCALTOP)/$(INTwork)/*.o
154	>	@rm -rf $(LOCALTOP)/$(INTwork)/*
155		endif
156		endif
157		endif

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines