diff options
| author | Jason Rumney <jasonr@gnu.org> | 2008-02-02 21:16:39 +0000 |
|---|---|---|
| committer | Jason Rumney <jasonr@gnu.org> | 2008-02-02 21:16:39 +0000 |
| commit | bfd1fa282dc3a11297a86069d5525d516bef2bd1 (patch) | |
| tree | 9afa0faafa08fd1773a9dc463cb74f395524cd87 /src/makefile.w32-in | |
| parent | a0fece3543ecb88d370bf39be351aaf71f4c4c35 (diff) | |
| download | emacs-bfd1fa282dc3a11297a86069d5525d516bef2bd1.tar.gz | |
Revert most of last two changes.
Diffstat (limited to 'src/makefile.w32-in')
| -rw-r--r-- | src/makefile.w32-in | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/src/makefile.w32-in b/src/makefile.w32-in index e0d9e0a28d2..7b3ba3cfd69 100644 --- a/src/makefile.w32-in +++ b/src/makefile.w32-in @@ -27,8 +27,6 @@ ALL = emacs # Set EMACSLOADPATH correctly (in case already defined in environment). EMACSLOADPATH=$(CURDIR)/../lisp -SRC = . - # # HAVE_CONFIG_H is required by some generic gnu sources stuck into # the emacs source tree. @@ -49,14 +47,6 @@ DOC = $(OBJDIR)/etc/DOC-X FULL_LINK_FLAGS = $(LINK_FLAGS) $(TEMACS_EXTRA_LINK) -CHARPROP = $(SRC)/../lisp/international/charprop.el -UNIDATA = $(SRC)/$(BLD)/unidata.txt -UNIDATA_SRC = $(SRC)/../admin/unidata/UnicodeData.txt -UNIDATA_GEN = $(SRC)/../admin/unidata/unidata-gen.elc -UNIDATA_GEN_SRC = $(SRC)/../admin/unidata/unidata-gen.el -UNIDATA_DEST = $(SRC)/../lisp/international -RUNTEMACS = "$(SRC)/$(BLD)/temacs.exe" - # # Split up the objects into two sets so that we don't run out of # command line space when we link them into a library. @@ -178,7 +168,7 @@ all: $(ALL) # The dumped executable # emacs: stamp_BLD $(EMACS) -$(EMACS): $(DOC) $(TEMACS) $(CHARPROP) +$(EMACS): $(DOC) $(TEMACS) "$(THISDIR)/$(BLD)/temacs.exe" -batch -l loadup dump -"$(THISDIR)/$(BLD)/emacs.exe" -q -batch -f list-load-path-shadows @@ -258,17 +248,6 @@ $(TLASTLIB): $(BLD)/lastfile.$(O) - $(DEL) $@ $(AR) $(AR_OUT)$@ $(ALL_DEPS) -$(CHARPROP): $(UNIDATA) $(UNIDATA_GEN) - $(RUNTEMACS) -batch --load $(UNIDATA_GEN) -f unidata-gen-files $(UNIDATA) - $(CP) *.el ../lisp/international - $(DEL) *.el - -$(UNIDATA): $(UNIDATA_SRC) - sed -e $(ARGQUOTE)s/\([^;]*\);\(.*\)/(#x\1 $(DQUOTE)\2$(DQUOTE))/$(ARGQUOTE) -e $(ARGQUOTE)s/;/$(DQUOTE) $(DQUOTE)/g$(ARGQUOTE) < $< > $@ - -$(UNIDATA_GEN): $(UNIDATA_GEN_SRC) - $(RUNTEMACS) -batch -f batch-byte-compile $(UNIDATA_GEN_SRC) - # # Assuming INSTALL_DIR is defined, build and install emacs in it. # @@ -299,6 +278,7 @@ cleanall: clean ### DEPENDENCIES ### EMACS_ROOT = .. +SRC = . $(BLD)/abbrev.$(O) : \ $(SRC)/abbrev.c \ |