Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit174f65a

Browse files
committed
Fix some oversights in distprep and maintainer-clean targets.
At least two recent commits have apparently imagined that a comment ina Makefile stating that something would be included in the distributiontarball was sufficient to make it so. They hadn't bothered to hookinto the upper maintainer-clean targets either. Per bug #5923 fromCharles Johnson, in which it emerged that the 9.1alpha4 tarballs areshort a few files that should be there.
1 parent76fdee3 commit174f65a

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

‎src/Makefile‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,19 @@ uninstall: uninstall-local
5050
uninstall-local:
5151
rm -f$(addprefix '$(DESTDIR)$(pgxsdir)/$(subdir)'/, Makefile.global Makefile.port Makefile.shlib nls-global.mk)
5252

53+
distprep:
54+
$(MAKE) -C test/isolation$@
55+
5356
clean:
5457
$(MAKE) -Ctest$@
5558
$(MAKE) -C tutorial NO_PGXS=1$@
59+
$(MAKE) -C test/isolation$@
5660
$(MAKE) -C test/thread$@
5761

5862
distcleanmaintainer-clean:
5963
$(MAKE) -Ctest$@
6064
$(MAKE) -C tutorial NO_PGXS=1$@
65+
$(MAKE) -C test/isolation$@
6166
$(MAKE) -C test/thread$@
6267
rm -f Makefile.port Makefile.global
6368

‎src/backend/Makefile‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,12 @@ utils/probes.o: utils/probes.d $(SUBDIROBJS)
193193

194194
##########################################################################
195195

196+
# Be sure that these files get removed by the maintainer-clean target
196197
distprep:
197198
$(MAKE) -C parsergram.c gram.h scan.c
198199
$(MAKE) -C bootstrapbootparse.c bootscanner.c
199200
$(MAKE) -C catalogschemapg.h postgres.bki postgres.description postgres.shdescription
201+
$(MAKE) -C replicationrepl_gram.c repl_scanner.c
200202
$(MAKE) -C utilsfmgrtab.c fmgroids.h errcodes.h
201203
$(MAKE) -C utils/miscguc-file.c
202204

@@ -300,12 +302,14 @@ maintainer-clean: distclean
300302
rm -f bootstrap/bootparse.c\
301303
bootstrap/bootscanner.c\
302304
parser/gram.c\
303-
parser/scan.c\
304305
parser/gram.h\
306+
parser/scan.c\
305307
catalog/schemapg.h\
306308
catalog/postgres.bki\
307309
catalog/postgres.description\
308310
catalog/postgres.shdescription\
311+
replication/repl_gram.c\
312+
replication/repl_scanner.c\
309313
utils/fmgroids.h\
310314
utils/fmgrtab.c\
311315
utils/errcodes.h\

‎src/test/isolation/Makefile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ all: isolationtester pg_isolation_regress
2929
isolationtester:$(OBJS) | submake-libpq submake-libpgport
3030
$(CC)$(CFLAGS)$(OBJS)$(libpq_pgport)$(LDFLAGS)$(LDFLAGS_EX)$(LIBS) -o$@$(X)
3131

32-
distprep: specparse.c
32+
distprep: specparse.c specscanner.c
3333

3434
# There is no correct way to write a rule that generates two files.
3535
# Rules with two targets don't have that meaning, they are merely
@@ -58,7 +58,9 @@ ifdef FLEX
5858
else
5959
@$(missing) flex $< $@
6060
endif
61-
# specparse.c is in the distribution tarball, so is not cleaned here
61+
62+
# specparse.c and specscanner.c are in the distribution tarball,
63+
# so do not clean them here
6264
cleandistclean:
6365
rm -f isolationtester$(X) pg_isolation_regress$(X)$(OBJS) isolation_main.o
6466
rm -f pg_regress.o

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp