Fossil SCM

Additional makefile changes so the "../$CHECKOUT/configure; make test" works.

drh 2011-10-20 01:12 UTC maketest_fixes
Commit 6f285b5fa919100e12d9dfb586320f61a845776b
2 files changed +1 -1 +1 -1
+1 -1
--- src/main.mk
+++ src/main.mk
@@ -287,11 +287,11 @@
287287
$(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
288288
289289
# WARNING. DANGER. Running the testsuite modifies the repository the
290290
# build is done from, i.e. the checkout belongs to. Do not sync/push
291291
# the repository after running the tests.
292
-test: $(APPNAME)
292
+test: $(OBJDIR) $(APPNAME)
293293
$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
294294
295295
$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
296296
$(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
297297
298298
--- src/main.mk
+++ src/main.mk
@@ -287,11 +287,11 @@
287 $(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
288
289 # WARNING. DANGER. Running the testsuite modifies the repository the
290 # build is done from, i.e. the checkout belongs to. Do not sync/push
291 # the repository after running the tests.
292 test: $(APPNAME)
293 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
294
295 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
296 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
297
298
--- src/main.mk
+++ src/main.mk
@@ -287,11 +287,11 @@
287 $(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
288
289 # WARNING. DANGER. Running the testsuite modifies the repository the
290 # build is done from, i.e. the checkout belongs to. Do not sync/push
291 # the repository after running the tests.
292 test: $(OBJDIR) $(APPNAME)
293 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
294
295 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
296 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
297
298
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -182,11 +182,11 @@
182182
$(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
183183
184184
# WARNING. DANGER. Running the testsuite modifies the repository the
185185
# build is done from, i.e. the checkout belongs to. Do not sync/push
186186
# the repository after running the tests.
187
-test: $(APPNAME)
187
+test: $(OBJDIR) $(APPNAME)
188188
$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
189189
190190
$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
191191
$(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
192192
$(SRCDIR)/../manifest \
193193
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -182,11 +182,11 @@
182 $(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
183
184 # WARNING. DANGER. Running the testsuite modifies the repository the
185 # build is done from, i.e. the checkout belongs to. Do not sync/push
186 # the repository after running the tests.
187 test: $(APPNAME)
188 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
189
190 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
191 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
192 $(SRCDIR)/../manifest \
193
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -182,11 +182,11 @@
182 $(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
183
184 # WARNING. DANGER. Running the testsuite modifies the repository the
185 # build is done from, i.e. the checkout belongs to. Do not sync/push
186 # the repository after running the tests.
187 test: $(OBJDIR) $(APPNAME)
188 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
189
190 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
191 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
192 $(SRCDIR)/../manifest \
193

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button