summaryrefslogtreecommitdiff
path: root/lib-src
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2012-07-09 02:59:38 +0200
committerJuanma Barranquero <lekktu@gmail.com>2012-07-09 02:59:38 +0200
commit31542918c320d00d8049341e3c78055664f3a847 (patch)
tree343bf4f0547799706c8dc5660a77471882c7037a /lib-src
parentab531b66f3a676ef047300f5201daa52993099b9 (diff)
downloademacs-31542918c320d00d8049341e3c78055664f3a847.tar.gz
lib-src/makefile.w32-in (ALL): Add profile.exe.
(PROFILEOBJS): New macro. ($(BLD)/profile.exe): New target. (install): Copy profile.exe. ($(BLD)/alloca.$(O), $(BLD)/tcp.$(O)): Remove, obsolete.
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ChangeLog8
-rw-r--r--lib-src/makefile.w32-in18
2 files changed, 16 insertions, 10 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 16e24b194d5..fbec59e0cbd 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,11 @@
+2012-07-09 Juanma Barranquero <lekktu@gmail.com>
+
+ * makefile.w32-in (ALL): Add profile.exe.
+ (PROFILEOBJS): New macro.
+ ($(BLD)/profile.exe): New target.
+ (install): Copy profile.exe.
+ ($(BLD)/alloca.$(O), $(BLD)/tcp.$(O)): Remove, obsolete.
+
2012-07-07 Juanma Barranquero <lekktu@gmail.com>
* makefile.w32-in ($(BLD)/ctags.$(O), $(BLD)/etags.$(O)):
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 98d003ac366..b475ff79c12 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -19,7 +19,7 @@
ALL = $(BLD)/test-distrib.exe $(BLD)/make-docfile.exe $(BLD)/hexl.exe\
$(BLD)/ctags.exe $(BLD)/etags.exe $(BLD)/movemail.exe $(BLD)/ebrowse.exe\
- $(BLD)/emacsclient.exe $(BLD)/emacsclientw.exe
+ $(BLD)/emacsclient.exe $(BLD)/emacsclientw.exe $(BLD)/profile.exe
.PHONY: make-docfile
@@ -110,6 +110,12 @@ CTAGS_CFLAGS = -DCTAGS $(ETAGS_CFLAGS)
$(BLD)/ctags.$(O): ctags.c
$(CC) $(CFLAGS) $(CTAGS_CFLAGS) $(CC_OUT)$@ ctags.c
+PROFILEOBJS = $(BLD)/profile.$(O) \
+ ../lib/$(BLD)/libgnu.$(A) \
+ $(BLD)/ntlib.$(O)
+$(BLD)/profile.exe: $(PROFILEOBJS)
+ $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(PROFILEOBJS) $(LIBS)
+
#
# From ..\src\Makefile.in
# It doesn't matter if the real name is *.obj for the files in this list,
@@ -306,6 +312,7 @@ install: $(INSTALL_FILES)
$(CP) $(BLD)/movemail.exe $(INSTALL_DIR)/bin
$(CP) $(BLD)/emacsclient.exe $(INSTALL_DIR)/bin
$(CP) $(BLD)/emacsclientw.exe $(INSTALL_DIR)/bin
+ $(CP) $(BLD)/profile.exe $(INSTALL_DIR)/bin
- mkdir "$(INSTALL_DIR)/etc"
$(CP) $(DOC) $(INSTALL_DIR)/etc
@@ -350,12 +357,6 @@ TAGS: $(BLD)/etags.exe *.c *.h
EMACS_ROOT = ..
SRC = .
-$(BLD)/alloca.$(O) : \
- $(SRC)/alloca.c \
- $(EMACS_ROOT)/src/s/ms-w32.h \
- $(EMACS_ROOT)/src/config.h \
- $(EMACS_ROOT)/src/blockinput.h
-
$(BLD)/ctags.$(O) : \
$(SRC)/ctags.c \
$(EMACS_ROOT)/nt/inc/sys/param.h \
@@ -424,9 +425,6 @@ $(BLD)/profile.$(O) : \
$(EMACS_ROOT)/lib-src/../src/config.h \
$(EMACS_ROOT)/lib-src/../src/systime.h
-$(BLD)/tcp.$(O) : \
- $(SRC)/tcp.c
-
$(BLD)/test-distrib.$(O) : \
$(SRC)/test-distrib.c