aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorPaul Eggert2012-07-08 21:56:32 -0700
committerPaul Eggert2012-07-08 21:56:32 -0700
commit8d16df0eec002109fd5373ea870504f3632219c7 (patch)
tree89f82c196c351ba32dfe6fae470519afe62f3b1e /lib-src
parentc4444d16dcc6b1cf2ac9e2c0bb20e3f5a54bdea1 (diff)
parent65e4651590d48fc135a317538c904e3c68218cec (diff)
downloademacs-8d16df0eec002109fd5373ea870504f3632219c7.tar.gz
emacs-8d16df0eec002109fd5373ea870504f3632219c7.zip
Merge from trunk.
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ChangeLog12
-rw-r--r--lib-src/makefile.w32-in132
2 files changed, 93 insertions, 51 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index fbec59e0cbd..de15c3d29d5 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,5 +1,17 @@
12012-07-09 Juanma Barranquero <lekktu@gmail.com> 12012-07-09 Juanma Barranquero <lekktu@gmail.com>
2 2
3 * makefile.w32-in ($(BLD)/test-distrib.exe): Use LIB_SRC, not SRC.
4 (LIB_SRC, NT_INC, GNU_LIB, MS_W32_H, CONFIG_H, INTTYPES_H, NTLIB_H)
5 (SYSTIME_H): New macros.
6 (SRC): Redefine to point to src/, not current directory.
7 ($(BLD)/ctags.$(O), $(BLD)/ebrowse.$(O), $(BLD)/emacsclient.$(O))
8 ($(BLD)/etags.$(O), $(BLD)/hexl.$(O), $(BLD)/make-docfile.$(O))
9 ($(BLD)/movemail.$(O), $(BLD)/ntlib.$(O), $(BLD)/pop.$(O))
10 ($(BLD)/profile.$(O), $(BLD)/test-distrib.$(O)): Update dependencies.
11 ($(BLD)/regex.$(O)): New dependency.
12
132012-07-09 Juanma Barranquero <lekktu@gmail.com>
14
3 * makefile.w32-in (ALL): Add profile.exe. 15 * makefile.w32-in (ALL): Add profile.exe.
4 (PROFILEOBJS): New macro. 16 (PROFILEOBJS): New macro.
5 ($(BLD)/profile.exe): New target. 17 ($(BLD)/profile.exe): New target.
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index b475ff79c12..4b2b523ea34 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -38,7 +38,7 @@ $(BLD)/hexl.exe: $(BLD)/hexl.$(O)
38 $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/hexl.$(O) $(LIBS) 38 $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/hexl.$(O) $(LIBS)
39$(BLD)/test-distrib.exe: $(BLD)/test-distrib.$(O) 39$(BLD)/test-distrib.exe: $(BLD)/test-distrib.$(O)
40 $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/test-distrib.$(O) $(LIBS) 40 $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/test-distrib.$(O) $(LIBS)
41 "$(BLD)/test-distrib.exe" "$(SRC)/testfile" 41 "$(BLD)/test-distrib.exe" "$(LIB_SRC)/testfile"
42 42
43MOVEMAILOBJS = $(BLD)/movemail.$(O) \ 43MOVEMAILOBJS = $(BLD)/movemail.$(O) \
44 $(BLD)/pop.$(O) \ 44 $(BLD)/pop.$(O) \
@@ -355,78 +355,108 @@ TAGS: $(BLD)/etags.exe *.c *.h
355### DEPENDENCIES ### 355### DEPENDENCIES ###
356 356
357EMACS_ROOT = .. 357EMACS_ROOT = ..
358SRC = . 358LIB_SRC = .
359SRC = $(EMACS_ROOT)/src
360NT_INC = $(EMACS_ROOT)/nt/inc
361GNU_LIB = $(EMACS_ROOT)/lib
362
363MS_W32_H = $(SRC)/s/ms-w32.h \
364 $(NT_INC)/sys/stat.h
365CONFIG_H = $(SRC)/config.h \
366 $(MS_W32_H)
367INTTYPES_H = $(NT_INC)/inttypes.h \
368 $(NT_INC)/stdint.h
369NTLIB_H = $(LIB_SRC)/ntlib.h \
370 $(NT_INC)/pwd.h
371SYSTIME_H = $(SRC)/systime.h \
372 $(NT_INC)/sys/time.h \
373 $(GNU_LIB)/timespec.h
359 374
360$(BLD)/ctags.$(O) : \ 375$(BLD)/ctags.$(O) : \
361 $(SRC)/ctags.c \ 376 $(LIB_SRC)/ctags.c \
362 $(EMACS_ROOT)/nt/inc/sys/param.h \ 377 $(SRC)/regex.h \
363 $(EMACS_ROOT)/nt/inc/sys/stat.h \ 378 $(NT_INC)/sys/stat.h \
364 $(EMACS_ROOT)/src/s/ms-w32.h \ 379 $(NT_INC)/unistd.h \
365 $(EMACS_ROOT)/lib-src/../src/config.h \ 380 $(GNU_LIB)/c-strcase.h \
366 $(SRC)/ntlib.h \ 381 $(GNU_LIB)/getopt.h \
367 $(EMACS_ROOT)/lib/c-strcase.h \ 382 $(CONFIG_H)
368 $(EMACS_ROOT)/lib/getopt.h
369 383
370$(BLD)/ebrowse.$(O) : \ 384$(BLD)/ebrowse.$(O) : \
371 $(SRC)/ebrowse.c \ 385 $(LIB_SRC)/ebrowse.c \
372 $(EMACS_ROOT)/lib/min-max.h \ 386 $(GNU_LIB)/getopt.h \
373 $(EMACS_ROOT)/src/s/ms-w32.h \ 387 $(GNU_LIB)/min-max.h \
374 $(EMACS_ROOT)/lib-src/../src/config.h 388 $(CONFIG_H)
375 389
376$(BLD)/emacsclient.$(O) : \ 390$(BLD)/emacsclient.$(O) : \
377 $(SRC)/emacsclient.c \ 391 $(LIB_SRC)/emacsclient.c \
378 $(EMACS_ROOT)/nt/inc/sys/stat.h \ 392 $(NT_INC)/pwd.h \
379 $(EMACS_ROOT)/src/s/ms-w32.h \ 393 $(NT_INC)/sys/stat.h \
380 $(EMACS_ROOT)/lib-src/../src/config.h 394 $(NT_INC)/unistd.h \
395 $(GNU_LIB)/getopt.h \
396 $(CONFIG_H)
381 397
382$(BLD)/etags.$(O) : \ 398$(BLD)/etags.$(O) : \
383 $(SRC)/etags.c \ 399 $(LIB_SRC)/etags.c \
384 $(EMACS_ROOT)/nt/inc/sys/param.h \ 400 $(SRC)/regex.h \
385 $(EMACS_ROOT)/nt/inc/sys/stat.h \ 401 $(NT_INC)/sys/stat.h \
386 $(EMACS_ROOT)/src/s/ms-w32.h \ 402 $(NT_INC)/unistd.h \
387 $(EMACS_ROOT)/lib-src/../src/config.h \ 403 $(GNU_LIB)/c-strcase.h \
388 $(SRC)/ntlib.h \ 404 $(GNU_LIB)/getopt.h \
389 $(EMACS_ROOT)/lib/c-strcase.h \ 405 $(CONFIG_H)
390 $(EMACS_ROOT)/lib/getopt.h
391 406
392$(BLD)/hexl.$(O) : \ 407$(BLD)/hexl.$(O) : \
393 $(SRC)/hexl.c 408 $(LIB_SRC)/hexl.c \
409 $(CONFIG_H)
394 410
395$(BLD)/make-docfile.$(O) : \ 411$(BLD)/make-docfile.$(O) : \
396 $(SRC)/make-docfile.c \ 412 $(LIB_SRC)/make-docfile.c \
397 $(EMACS_ROOT)/src/config.h 413 $(NT_INC)/unistd.h \
414 $(CONFIG_H)
398 415
399$(BLD)/movemail.$(O) : \ 416$(BLD)/movemail.$(O) : \
400 $(SRC)/movemail.c \ 417 $(LIB_SRC)/movemail.c \
401 $(EMACS_ROOT)/src/s/ms-w32.h \ 418 $(LIB_SRC)/pop.h \
402 $(EMACS_ROOT)/lib-src/../src/config.h \ 419 $(SRC)/syswait.h \
403 $(EMACS_ROOT)/nt/inc/sys/file.h \ 420 $(NT_INC)/pwd.h \
404 $(EMACS_ROOT)/nt/inc/sys/stat.h \ 421 $(NT_INC)/sys/file.h \
405 $(EMACS_ROOT)/lib-src/../src/syswait.h \ 422 $(NT_INC)/sys/stat.h \
406 $(EMACS_ROOT)/nt/inc/pwd.h \ 423 $(NT_INC)/unistd.h \
407 $(SRC)/ntlib.h 424 $(GNU_LIB)/getopt.h \
408 $(CC) $(CFLAGS) -DUSG $(CC_OUT)$@ movemail.c 425 $(CONFIG_H) \
426 $(NTLIB_H)
409 427
410$(BLD)/ntlib.$(O) : \ 428$(BLD)/ntlib.$(O) : \
411 $(SRC)/ntlib.c \ 429 $(LIB_SRC)/ntlib.c \
412 $(SRC)/ntlib.h \ 430 $(NT_INC)/sys/stat.h \
413 $(EMACS_ROOT)/nt/inc/sys/stat.h \ 431 $(NTLIB_H)
414 $(EMACS_ROOT)/nt/inc/pwd.h
415 432
416$(BLD)/pop.$(O) : \ 433$(BLD)/pop.$(O) : \
417 $(SRC)/pop.c \ 434 $(LIB_SRC)/pop.c \
418 $(SRC)/pop.h \ 435 $(LIB_SRC)/pop.h \
419 $(EMACS_ROOT)/lib/min-max.h \ 436 $(NT_INC)/netdb.h \
420 $(SRC)/ntlib.h 437 $(NT_INC)/pwd.h \
438 $(NT_INC)/unistd.h \
439 $(GNU_LIB)/min-max.h \
440 $(CONFIG_H) \
441 $(NTLIB_H)
421 442
422$(BLD)/profile.$(O) : \ 443$(BLD)/profile.$(O) : \
423 $(SRC)/profile.c \ 444 $(LIB_SRC)/profile.c \
424 $(EMACS_ROOT)/src/s/ms-w32.h \ 445 $(GNU_LIB)/intprops.h \
425 $(EMACS_ROOT)/lib-src/../src/config.h \ 446 $(CONFIG_H) \
426 $(EMACS_ROOT)/lib-src/../src/systime.h 447 $(INTTYPES_H) \
448 $(SYSTIME_H)
449
450$(BLD)/regex.$(O) : \
451 $(SRC)/regex.c \
452 $(SRC)/regex.h \
453 $(NT_INC)/unistd.h \
454 $(CONFIG_H)
427 455
428$(BLD)/test-distrib.$(O) : \ 456$(BLD)/test-distrib.$(O) : \
429 $(SRC)/test-distrib.c 457 $(LIB_SRC)/test-distrib.c \
458 $(NT_INC)/unistd.h \
459 $(CONFIG_H)
430 460
431# The following dependencies are for supporting parallel builds, where 461# The following dependencies are for supporting parallel builds, where
432# we must make sure $(BLD) exists before any compilation starts. 462# we must make sure $(BLD) exists before any compilation starts.
generated by cgit v1.2.1 (git 2.18.0) at 2026-01-31 17:52:22 +0000