mirror of
https://git.code.sf.net/p/quake/quakeforge-old
synced 2025-03-12 12:02:32 +00:00
clean up the configure section a little. basicly merge redundant rules.
This commit is contained in:
parent
221b259d62
commit
927e20799f
1 changed files with 7 additions and 16 deletions
23
Makefile.in
23
Makefile.in
|
@ -16,16 +16,6 @@ all: Makefile
|
||||||
$(MAKE) -C $$dir $@ || exit; \
|
$(MAKE) -C $$dir $@ || exit; \
|
||||||
done
|
done
|
||||||
|
|
||||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
||||||
cd $(top_builddir) \
|
|
||||||
&& CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
|
||||||
|
|
||||||
config.status: $(srcdir)/configure
|
|
||||||
$(SHELL) ./config.status --recheck
|
|
||||||
|
|
||||||
$(srcdir)/configure: $(srcdir)/configure.in
|
|
||||||
(cd $(srcdir) && autoconf || true)
|
|
||||||
|
|
||||||
distclean:
|
distclean:
|
||||||
rm -f config.cache config.log config.status Makefile
|
rm -f config.cache config.log config.status Makefile
|
||||||
rm -f common/config.h
|
rm -f common/config.h
|
||||||
|
@ -57,16 +47,17 @@ changelog:
|
||||||
|
|
||||||
# Code to automatically re-configure, only runs if you are compiling in the
|
# Code to automatically re-configure, only runs if you are compiling in the
|
||||||
# source directory
|
# source directory
|
||||||
ifeq ($(srcdir),.)
|
|
||||||
configure: configure.in acconfig.h
|
config.status: $(srcdir)/configure
|
||||||
./bootstrap
|
$(SHELL) ./config.status --recheck
|
||||||
|
|
||||||
|
$(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/acconfig.h
|
||||||
|
(cd $(srcdir) && ./bootstrap || true)
|
||||||
|
|
||||||
CONFIG_SRC = Makefile.in Rules.mk.in qw_client/Makefile.in \
|
CONFIG_SRC = Makefile.in Rules.mk.in qw_client/Makefile.in \
|
||||||
qw_server/Makefile.in uquake/Makefile.in common/Makefile.in \
|
qw_server/Makefile.in uquake/Makefile.in common/Makefile.in \
|
||||||
rpm/build_rpm.in rpm/quakeforge.spec.in
|
rpm/build_rpm.in rpm/quakeforge.spec.in
|
||||||
|
|
||||||
$(patsubst %.in,%,$(CONFIG_SRC)): configure $(CONFIG_SRC)
|
$(patsubst %.in,%,$(CONFIG_SRC)): configure $(patsubst %.in,$(srcdir)/%.in,$(CONFIG_SRC))
|
||||||
$(SHELL) ./config.status --recheck
|
$(SHELL) ./config.status --recheck
|
||||||
$(SHELL) ./config.status
|
$(SHELL) ./config.status
|
||||||
|
|
||||||
endif
|
|
||||||
|
|
Loading…
Reference in a new issue