mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-12-15 08:20:16 +08:00
Fix some oversights in distprep and maintainer-clean targets.
At least two recent commits have apparently imagined that a comment in a Makefile stating that something would be included in the distribution tarball was sufficient to make it so. They hadn't bothered to hook into the upper maintainer-clean targets either. Per bug #5923 from Charles Johnson, in which it emerged that the 9.1alpha4 tarballs are short a few files that should be there.
This commit is contained in:
parent
76fdee31c4
commit
174f65ab00
@ -50,14 +50,19 @@ uninstall: uninstall-local
|
|||||||
uninstall-local:
|
uninstall-local:
|
||||||
rm -f $(addprefix '$(DESTDIR)$(pgxsdir)/$(subdir)'/, Makefile.global Makefile.port Makefile.shlib nls-global.mk)
|
rm -f $(addprefix '$(DESTDIR)$(pgxsdir)/$(subdir)'/, Makefile.global Makefile.port Makefile.shlib nls-global.mk)
|
||||||
|
|
||||||
|
distprep:
|
||||||
|
$(MAKE) -C test/isolation $@
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
$(MAKE) -C test $@
|
$(MAKE) -C test $@
|
||||||
$(MAKE) -C tutorial NO_PGXS=1 $@
|
$(MAKE) -C tutorial NO_PGXS=1 $@
|
||||||
|
$(MAKE) -C test/isolation $@
|
||||||
$(MAKE) -C test/thread $@
|
$(MAKE) -C test/thread $@
|
||||||
|
|
||||||
distclean maintainer-clean:
|
distclean maintainer-clean:
|
||||||
$(MAKE) -C test $@
|
$(MAKE) -C test $@
|
||||||
$(MAKE) -C tutorial NO_PGXS=1 $@
|
$(MAKE) -C tutorial NO_PGXS=1 $@
|
||||||
|
$(MAKE) -C test/isolation $@
|
||||||
$(MAKE) -C test/thread $@
|
$(MAKE) -C test/thread $@
|
||||||
rm -f Makefile.port Makefile.global
|
rm -f Makefile.port Makefile.global
|
||||||
|
|
||||||
|
@ -193,10 +193,12 @@ utils/probes.o: utils/probes.d $(SUBDIROBJS)
|
|||||||
|
|
||||||
##########################################################################
|
##########################################################################
|
||||||
|
|
||||||
|
# Be sure that these files get removed by the maintainer-clean target
|
||||||
distprep:
|
distprep:
|
||||||
$(MAKE) -C parser gram.c gram.h scan.c
|
$(MAKE) -C parser gram.c gram.h scan.c
|
||||||
$(MAKE) -C bootstrap bootparse.c bootscanner.c
|
$(MAKE) -C bootstrap bootparse.c bootscanner.c
|
||||||
$(MAKE) -C catalog schemapg.h postgres.bki postgres.description postgres.shdescription
|
$(MAKE) -C catalog schemapg.h postgres.bki postgres.description postgres.shdescription
|
||||||
|
$(MAKE) -C replication repl_gram.c repl_scanner.c
|
||||||
$(MAKE) -C utils fmgrtab.c fmgroids.h errcodes.h
|
$(MAKE) -C utils fmgrtab.c fmgroids.h errcodes.h
|
||||||
$(MAKE) -C utils/misc guc-file.c
|
$(MAKE) -C utils/misc guc-file.c
|
||||||
|
|
||||||
@ -300,12 +302,14 @@ maintainer-clean: distclean
|
|||||||
rm -f bootstrap/bootparse.c \
|
rm -f bootstrap/bootparse.c \
|
||||||
bootstrap/bootscanner.c \
|
bootstrap/bootscanner.c \
|
||||||
parser/gram.c \
|
parser/gram.c \
|
||||||
parser/scan.c \
|
|
||||||
parser/gram.h \
|
parser/gram.h \
|
||||||
|
parser/scan.c \
|
||||||
catalog/schemapg.h \
|
catalog/schemapg.h \
|
||||||
catalog/postgres.bki \
|
catalog/postgres.bki \
|
||||||
catalog/postgres.description \
|
catalog/postgres.description \
|
||||||
catalog/postgres.shdescription \
|
catalog/postgres.shdescription \
|
||||||
|
replication/repl_gram.c \
|
||||||
|
replication/repl_scanner.c \
|
||||||
utils/fmgroids.h \
|
utils/fmgroids.h \
|
||||||
utils/fmgrtab.c \
|
utils/fmgrtab.c \
|
||||||
utils/errcodes.h \
|
utils/errcodes.h \
|
||||||
|
@ -29,7 +29,7 @@ all: isolationtester pg_isolation_regress
|
|||||||
isolationtester: $(OBJS) | submake-libpq submake-libpgport
|
isolationtester: $(OBJS) | submake-libpq submake-libpgport
|
||||||
$(CC) $(CFLAGS) $(OBJS) $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
|
$(CC) $(CFLAGS) $(OBJS) $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
|
||||||
|
|
||||||
distprep: specparse.c
|
distprep: specparse.c specscanner.c
|
||||||
|
|
||||||
# There is no correct way to write a rule that generates two files.
|
# There is no correct way to write a rule that generates two files.
|
||||||
# Rules with two targets don't have that meaning, they are merely
|
# Rules with two targets don't have that meaning, they are merely
|
||||||
@ -58,7 +58,9 @@ ifdef FLEX
|
|||||||
else
|
else
|
||||||
@$(missing) flex $< $@
|
@$(missing) flex $< $@
|
||||||
endif
|
endif
|
||||||
# specparse.c is in the distribution tarball, so is not cleaned here
|
|
||||||
|
# specparse.c and specscanner.c are in the distribution tarball,
|
||||||
|
# so do not clean them here
|
||||||
clean distclean:
|
clean distclean:
|
||||||
rm -f isolationtester$(X) pg_isolation_regress$(X) $(OBJS) isolation_main.o
|
rm -f isolationtester$(X) pg_isolation_regress$(X) $(OBJS) isolation_main.o
|
||||||
rm -f pg_regress.o
|
rm -f pg_regress.o
|
||||||
|
Loading…
Reference in New Issue
Block a user