From acddf8aec716be7810edc29e1a7eeb396fc755c3 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 10 May 2010 19:51:08 -0700 Subject: On msdos, set LIBS_SYSTEM with config.bat, not cpp. * config.bat [HAVE_X11]: Run sed3x.inp on lib-src/Makefile. * src/Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset. * src/s/msdos.h (MSDOS_LIBS_SYSTEM): Remove. * msdos/sed1x.inp (LIBS_SYSTEM): Edit to -lxext -lsys. * msdos/sed3x.inp: New file. * lib-src/Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset. (config.h) [MSDOS]: Do not include. --- lib-src/ChangeLog | 5 +++++ lib-src/Makefile.in | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 608d5c618b3..6f3879fb266 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2010-05-11 Glenn Morris + + * Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset. + (config.h) [MSDOS]: Do not include. + 2010-05-10 Glenn Morris * Makefile.in (LIBS_SYSTEM): Set with configure, not cpp. diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 5f0fb6e671f..683a97393db 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -167,11 +167,6 @@ CPP_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H -I. -I../src # ========================== start of cpp stuff ======================= /* From here on, comments must be done in C syntax. */ -#ifdef MSDOS -#include "../src/config.h" -LIBS_SYSTEM = MSDOS_LIBS_SYSTEM -#endif - LOADLIBES=$(LIBS_SYSTEM) -- cgit v1.2.1 From d3b23034e8730133e23d6b51905b181f12bfb253 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 10 May 2010 20:00:32 -0700 Subject: Do not preprocess lib-src/Makefile.in * configure.in: Generate lib-src/Makefile directly, do not run cpp. * config.bat: Do not run cpp on lib-src/Makefile.in. * lib-src/Makefile.in: Convert comments to makefile format. * admin/notes/cpp: lib-src/Makefile not preprocessed. --- lib-src/ChangeLog | 2 ++ lib-src/Makefile.in | 68 ++++++++++++++++++++++++++--------------------------- 2 files changed, 35 insertions(+), 35 deletions(-) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 6f3879fb266..c9a054b9e23 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,5 +1,7 @@ 2010-05-11 Glenn Morris + * Makefile.in: Convert comments to makefile format. + * Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset. (config.h) [MSDOS]: Do not include. diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 683a97393db..a2773aa916d 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -31,6 +31,7 @@ EMACSOPT = -batch --no-site-file --multibyte CC=@CC@ CFLAGS=@CFLAGS@ version=@version@ +## Used in $archlibdir. configuration=@configuration@ EXEEXT=@EXEEXT@ C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@ @@ -127,8 +128,8 @@ EXECUTABLES= ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS} # Specify additional -D flags for movemail. Options: # -DMAIL_USE_FLOCK or -DMAIL_USE_LOCKF (use flock or lockf for file locking). # See the comments about locking in movemail.c. Normally the values -# in ../src/[ms]/*.h should be correct and you should not need to do anything. -# If neither flag is set, blessmail is used. +# set by configure should be correct and you should not need to do anything. +# If neither flag is set, you need to use blessmail. MOVE_FLAGS= ## Empty if either MAIL_USE_FLOCK or MAIL_USE_LOCKF, else need-blessmail. @@ -164,18 +165,15 @@ ALL_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H -I. -I../src LINK_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H -I. -I../src -I${srcdir} -I${srcdir}/../src ${LDFLAGS} ${CFLAGS} CPP_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H -I. -I../src -I${srcdir} -I${srcdir}/../src ${CPPFLAGS} ${CFLAGS} -# ========================== start of cpp stuff ======================= -/* From here on, comments must be done in C syntax. */ - LOADLIBES=$(LIBS_SYSTEM) .SUFFIXES: .m -/* This is the default compilation command. - But we should never rely on it, because some make version - failed to find it for getopt.o. - Using an explicit command made it work. */ +## This is the default compilation command. +## But we should never rely on it, because some make version failed to +## find it for getopt.o. +## Using an explicit command made it work. .c.o: ${CC} -c ${CPP_CFLAGS} $< @@ -184,11 +182,10 @@ LOADLIBES=$(LIBS_SYSTEM) all: ${DONT_INSTALL} ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS} -/* These targets copy the scripts into the build directory -so that they can be run from there in an uninstalled Emacs. -The "-" is prepended because some versions of cp barf when -srcdir is the current directory, and thus the file will be -copied into itself. */ +## These targets copy the scripts into the build directory so that +## they can be run from there in an uninstalled Emacs. +## The "-" is prepended because some versions of cp barf when srcdir +## is the current directory, and thus the file will be copied into itself. rcs2log: $(srcdir)/rcs2log -cp -p $(srcdir)/rcs2log rcs2log @@ -201,16 +198,15 @@ grep-changelog: $(srcdir)/grep-changelog vcdiff: $(srcdir)/vcdiff -cp -p $(srcdir)/vcdiff vcdiff -/* Only used if we need blessmail, but no harm in always defining. - This makes the actual blessmail executable. */ +## Only used if we need blessmail, but no harm in always defining. +## This makes the actual blessmail executable. blessmail: $(EMACS) $(EMACSOPT) -l $(srcdir)/../lisp/mail/blessmail.el chmod +x blessmail -/* This checks if we need to run blessmail. */ +## This checks if we need to run blessmail. +## Do not charge ahead and do it! Let the installer decide. need-blessmail: blessmail -/* Don\'t charge ahead and do it! Let the installer decide. - ./blessmail $(DESTDIR)${archlibdir}/movemail${EXEEXT} */ @if [ `wc -l when the system - does not have one that works with the given compiler. */ +## We need the following in order to create a when the system +## does not have one that works with the given compiler. GETOPT_H = @GETOPT_H@ getopt.h: getopt_.h cp $(srcdir)/getopt_.h $@-t @@ -331,8 +327,8 @@ etags${EXEEXT}: ${srcdir}/etags.c $(GETOPTDEPS) $(REGEXPDEPS) ../src/config.h ebrowse${EXEEXT}: ${srcdir}/ebrowse.c $(GETOPTDEPS) ../src/config.h $(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" ${srcdir}/ebrowse.c $(GETOPTOBJS) $(LOADLIBES) -o ebrowse -/* We depend on etags to assure that parallel makes don\'t write two - etags.o files on top of each other. */ +## We depend on etags to assure that parallel makes do not write two +## etags.o files on top of each other. ctags${EXEEXT}: etags${EXEEXT} $(CC) ${ALL_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs\"" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o ctags @@ -355,7 +351,7 @@ b2m${EXEEXT}: ${srcdir}/b2m.c ../src/config.h $(GETOPTDEPS) movemail${EXEEXT}: movemail.o pop.o $(GETOPTDEPS) $(CC) ${LINK_CFLAGS} ${MOVE_FLAGS} movemail.o pop.o $(GETOPTOBJS) $(LOADLIBES) $(LIBS_MOVE) -o movemail -/* We need to define emacs to get the right version of something (what?). */ +## We need to define emacs to get the right version of something (what?). movemail.o: ${srcdir}/movemail.c ../src/config.h $(GETOPT_H) $(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} ${srcdir}/movemail.c @@ -379,3 +375,5 @@ update-game-score${EXEEXT}: update-game-score.o $(GETOPTDEPS) update-game-score.o: ${srcdir}/update-game-score.c ../src/config.h $(GETOPT_H) $(CC) -c ${CPP_CFLAGS} ${srcdir}/update-game-score.c \ -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" + +## Makefile ends here. -- cgit v1.2.1 From c88b05a9d69ee8d35e408d70a80538fdd13f1a3d Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 10 May 2010 20:18:58 -0700 Subject: Minor lib-src/Makefile.in edits. * lib-src/Makefile.in (.m.o): Remove, there are no .m files. (BASE_CFLAGS): New variable. (ALL_CFLAGS, LINK_CFLAGS, CPP_CFLAGS): Use $BASE_CFLAGS. (check): Update the message. (update-game-score${EXEEXT}): Do not use $MOVE_FLAGS. --- lib-src/ChangeLog | 6 ++++++ lib-src/Makefile.in | 17 +++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index c9a054b9e23..64cc3dde93a 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,5 +1,11 @@ 2010-05-11 Glenn Morris + * Makefile.in (.m.o): Remove, there are no .m files. + (BASE_CFLAGS): New variable. + (ALL_CFLAGS, LINK_CFLAGS, CPP_CFLAGS): Use $BASE_CFLAGS. + (check): Update the message. + (update-game-score${EXEEXT}): Do not use $MOVE_FLAGS. + * Makefile.in: Convert comments to makefile format. * Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset. diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index a2773aa916d..c8f9042f9f8 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -161,15 +161,15 @@ LIBS_SYSTEM = @LIBS_SYSTEM@ # Those files shared with other GNU utilities need HAVE_CONFIG_H # defined before they know they can take advantage of the information # in ../src/config.h. -ALL_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H -I. -I../src -I${srcdir} -I${srcdir}/../src ${LDFLAGS} ${CPPFLAGS} ${CFLAGS} -LINK_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H -I. -I../src -I${srcdir} -I${srcdir}/../src ${LDFLAGS} ${CFLAGS} -CPP_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H -I. -I../src -I${srcdir} -I${srcdir}/../src ${CPPFLAGS} ${CFLAGS} +BASE_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H -I. -I../src -I${srcdir} -I${srcdir}/../src + +ALL_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS} +LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS} +CPP_CFLAGS = ${BASE_CFLAGS} ${CPPFLAGS} ${CFLAGS} LOADLIBES=$(LIBS_SYSTEM) -.SUFFIXES: .m - ## This is the default compilation command. ## But we should never rely on it, because some make version failed to ## find it for getopt.o. @@ -177,9 +177,6 @@ LOADLIBES=$(LIBS_SYSTEM) .c.o: ${CC} -c ${CPP_CFLAGS} $< -.m.o: - $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< - all: ${DONT_INSTALL} ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS} ## These targets copy the scripts into the build directory so that @@ -287,7 +284,7 @@ extraclean: maintainer-clean ## Test the contents of the directory. check: - @echo "We don't have any tests for GNU Emacs yet." + @echo "We don't have any tests for the lib-src/ directory yet." tags: TAGS TAGS: etags${EXEEXT} @@ -370,7 +367,7 @@ hexl${EXEEXT}: ${srcdir}/hexl.c ../src/config.h $(CC) ${ALL_CFLAGS} ${srcdir}/hexl.c $(LOADLIBES) -o hexl update-game-score${EXEEXT}: update-game-score.o $(GETOPTDEPS) - $(CC) ${LINK_CFLAGS} ${MOVE_FLAGS} update-game-score.o $(GETOPTOBJS) $(LOADLIBES) -o update-game-score + $(CC) ${LINK_CFLAGS} update-game-score.o $(GETOPTOBJS) $(LOADLIBES) -o update-game-score update-game-score.o: ${srcdir}/update-game-score.c ../src/config.h $(GETOPT_H) $(CC) -c ${CPP_CFLAGS} ${srcdir}/update-game-score.c \ -- cgit v1.2.1 From 44b031a6b00d435deab1ba36cf4a80183c0fe5aa Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 11 May 2010 20:06:50 -0700 Subject: Remove unused output variable LIB_SRC_EXTRA_INSTALLABLES. * configure.in (LIB_SRC_EXTRA_INSTALLABLES): Remove, unused. * lib-src/Makefile.in (INSTALLABLES): Remove @LIB_SRC_EXTRA_INSTALLABLES@. * msdos/sed3v2.inp (INSTALLABLES): No more @LIB_SRC_EXTRA_INSTALLABLES@. --- lib-src/ChangeLog | 4 ++++ lib-src/Makefile.in | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 64cc3dde93a..36e2f29e58f 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2010-05-12 Glenn Morris + + * Makefile.in (INSTALLABLES): Remove @LIB_SRC_EXTRA_INSTALLABLES@. + 2010-05-11 Glenn Morris * Makefile.in (.m.o): Remove, there are no .m files. diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index c8f9042f9f8..4799a9fefc4 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -108,7 +108,7 @@ INSTALL_STRIP = # Things that a user might actually run, # which should be installed in bindir. -INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} b2m${EXEEXT} ebrowse${EXEEXT} @LIB_SRC_EXTRA_INSTALLABLES@ +INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} b2m${EXEEXT} ebrowse${EXEEXT} INSTALLABLE_SCRIPTS = rcs-checkin grep-changelog # Things that Emacs runs internally, or during the build process, -- cgit v1.2.1