ok.
i put my changes back in. hopefully you should be able to compile again.
Paul Krause wrote:
> From: Ben Wing [mailto:ben@666.com]
> is glyphs-shared mentioned [twice] in xemacs.mak?
It is not. It appears to have been removed by
revision 1.69
date: 2001/05/27 10:50:44; author: nick; state: Exp; lines: +31 -28
Suppress overwrite confirmation in xemacs.mak
Index: xemacs.mak
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/nt/xemacs.mak,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -c -r1.68 -r1.69
cvs server: conflicting specifications of output style
*** xemacs.mak 2001/05/26 12:24:51 1.68
--- xemacs.mak 2001/05/27 10:50:44 1.69
***************
*** 48,53 ****
--- 48,58 ----
# Define a variable for the 'del' command to use
DEL=-del
+ # Define a variable for 'copy' command to use
+ # Suppress confirmation for overwriting files
+ COPY=xcopy /q /y
+ COPYDIR=xcopy /q /y /e
+
# Program name and version
!include "$(XEMACS)\version.sh"
***************
*** 325,337 ****
! if defined(_)
! if [perl -p -e "s/^\\x23if defined(.+)/!if defined$$1/;
s/^\\x23e/!e/;" \
-e
"s/([\\s=^])([\\w\\d\\.\\-^]+\\.[ch^])/$$1$(SRC:\=\\\\)\\\\$$2/g;" \
! -e "s/^(.+)\\.o:(.+)/$(OUTDIR:\=\\\\)\\\\$$1.obj:$$2
$(NT:\=\\\\)\\\\config.inc/;" \
< $(SRC)\depend > $(OUTDIR)\depend.tmp]
! endif
! else
! if [perl -p -e "s/^\x23if defined(.+)/!if defined$$1/;
s/^\x23e/!e/;" \
-e "s/([\s=^])([\w\d\.\-^]+\.[ch^])/$$1$(SRC:\=\\)\\$$2/g;" \
! -e "s/^(.+)\.o:(.+)/$(OUTDIR:\=\\)\\$$1.obj:$$2
$(NT:\=\\)\\config.inc/;" \
< $(SRC)\depend > $(OUTDIR)\depend.tmp]
! endif
! endif
--- 330,342 ----
! if defined(_)
! if [perl -p -e "s/^\\x23if defined(.+)/!if defined$$1/;
s/^\\x23e/!e/;" \
-e
"s/([\\s=^])([\\w\\d\\.\\-^]+\\.[ch^])/$$1$(SRC:\=\\\\)\\\\$$2/g;" \
! -e "s/^(.+)\\.o:(.+)/$(OUTDIR:\=\\\\)\\\\$$1.obj:$$2/;" \
< $(SRC)\depend > $(OUTDIR)\depend.tmp]
! endif
! else
! if [perl -p -e "s/^\x23if defined(.+)/!if defined$$1/;
s/^\x23e/!e/;" \
-e "s/([\s=^])([\w\d\.\-^]+\.[ch^])/$$1$(SRC:\=\\)\\$$2/g;" \
! -e "s/^(.+)\.o:(.+)/$(OUTDIR:\=\\)\\$$1.obj:$$2/;" \
< $(SRC)\depend > $(OUTDIR)\depend.tmp]
! endif
! endif
***************
*** 502,514 ****
$(SRC)\paths.h
$(SRC)\config.h: config.h
! copy config.h $(SRC)
$(SRC)\Emacs.ad.h: Emacs.ad.h
! copy Emacs.ad.h $(SRC)
$(SRC)\paths.h: paths.h
! copy paths.h $(SRC)
#-----------------------------------------------------------------------
-------
--- 507,519 ----
$(SRC)\paths.h
$(SRC)\config.h: config.h
! @$(COPY) config.h $(SRC)
$(SRC)\Emacs.ad.h: Emacs.ad.h
! @$(COPY) Emacs.ad.h $(SRC)
$(SRC)\paths.h: paths.h
! @$(COPY) paths.h $(SRC)
#-----------------------------------------------------------------------
-------
***************
*** 605,611 ****
link.exe -lib -nologo -out:$@ $(LASTFILE_OBJS)
$(OUTDIR)\lastfile.obj: $(LASTFILE_SRC)\lastfile.c
! $(CCV) $(LASTFILE_FLAGS) $(LASTFILE_SRC)\$((a)B).c
!endif
--- 610,616 ----
link.exe -lib -nologo -out:$@ $(LASTFILE_OBJS)
$(OUTDIR)\lastfile.obj: $(LASTFILE_SRC)\lastfile.c
! $(CCV) $(LASTFILE_FLAGS) $**
!endif
***************
*** 632,653 ****
link.exe -lib -nologo -out:$@ $(LWLIB_OBJS)
$(OUTDIR)\lwlib-utils.obj: $(LWLIB_SRCDIR)\lwlib-utils.c
! $(CCV) $(LWLIB_FLAGS) $(LWLIB_SRCDIR)\$((a)B).c
$(OUTDIR)\lwlib-Xaw.obj: $(LWLIB_SRCDIR)\lwlib-Xaw.c
! $(CCV) $(LWLIB_FLAGS) $(LWLIB_SRCDIR)\$((a)B).c
$(OUTDIR)\lwlib-Xlw.obj: $(LWLIB_SRCDIR)\lwlib-Xlw.c
! $(CCV) $(LWLIB_FLAGS) $(LWLIB_SRCDIR)\$((a)B).c
$(OUTDIR)\lwlib.obj: $(LWLIB_SRCDIR)\lwlib.c
! $(CCV) $(LWLIB_FLAGS) $(LWLIB_SRCDIR)\$((a)B).c
$(OUTDIR)\xlwmenu.obj: $(LWLIB_SRCDIR)\xlwmenu.c
! $(CCV) $(LWLIB_FLAGS) $(LWLIB_SRCDIR)\$((a)B).c
$(OUTDIR)\xlwscrollbar.obj: $(LWLIB_SRCDIR)\xlwscrollbar.c
! $(CCV) $(LWLIB_FLAGS) $(LWLIB_SRCDIR)\$((a)B).c
!endif
#-----------------------------------------------------------------------
-------
--- 637,658 ----
link.exe -lib -nologo -out:$@ $(LWLIB_OBJS)
$(OUTDIR)\lwlib-utils.obj: $(LWLIB_SRCDIR)\lwlib-utils.c
! $(CCV) $(LWLIB_FLAGS) $**
$(OUTDIR)\lwlib-Xaw.obj: $(LWLIB_SRCDIR)\lwlib-Xaw.c
! $(CCV) $(LWLIB_FLAGS) $**
$(OUTDIR)\lwlib-Xlw.obj: $(LWLIB_SRCDIR)\lwlib-Xlw.c
! $(CCV) $(LWLIB_FLAGS) $**
$(OUTDIR)\lwlib.obj: $(LWLIB_SRCDIR)\lwlib.c
! $(CCV) $(LWLIB_FLAGS) $**
$(OUTDIR)\xlwmenu.obj: $(LWLIB_SRCDIR)\xlwmenu.c
! $(CCV) $(LWLIB_FLAGS) $**
$(OUTDIR)\xlwscrollbar.obj: $(LWLIB_SRCDIR)\xlwscrollbar.c
! $(CCV) $(LWLIB_FLAGS) $**
!endif
#-----------------------------------------------------------------------
-------
***************
*** 696,702 ****
$(SRC)\getloadavg.c \
$(SRC)\glyphs.c \
$(SRC)\glyphs-eimage.c \
- $(SRC)\glyphs-shared.c \
$(SRC)\glyphs-widget.c \
$(SRC)\gui.c \
$(SRC)\gutter.c \
--- 701,706 ----
***************
*** 988,994 ****
$(OUTDIR)\getloadavg.obj \
$(OUTDIR)\glyphs.obj \
$(OUTDIR)\glyphs-eimage.obj \
- $(OUTDIR)\glyphs-shared.obj \
$(OUTDIR)\glyphs-widget.obj \
$(OUTDIR)\gui.obj \
$(OUTDIR)\gutter.obj \
--- 992,997 ----
***************
*** 1053,1062 ****
$(OUTDIR)\emacs.obj: $(XEMACS)\version.sh
$(OUTDIR)\TopLevelEmacsShell.obj: $(TEMACS_SRC)\EmacsShell-sub.c
! $(CCV) $(TEMACS_CPP_FLAGS) -DDEFINE_TOP_LEVEL_EMACS_SHELL
$(TEMACS_SRC)\$((a)B).c -Fo$@
$(OUTDIR)\TransientEmacsShell.obj: $(TEMACS_SRC)\EmacsShell-sub.c
! $(CCV) $(TEMACS_CPP_FLAGS) -DDEFINE_TRANSIENT_EMACS_SHELL
$(TEMACS_SRC)\$((a)B).c -Fo$@
$(OUTDIR)\alloc.obj: $(TEMACS_SRC)\alloc.c
--- 1056,1065 ----
$(OUTDIR)\emacs.obj: $(XEMACS)\version.sh
$(OUTDIR)\TopLevelEmacsShell.obj: $(TEMACS_SRC)\EmacsShell-sub.c
! $(CCV) $(TEMACS_CPP_FLAGS) -DDEFINE_TOP_LEVEL_EMACS_SHELL $**
-Fo$@
$(OUTDIR)\TransientEmacsShell.obj: $(TEMACS_SRC)\EmacsShell-sub.c
! $(CCV) $(TEMACS_CPP_FLAGS) -DDEFINE_TRANSIENT_EMACS_SHELL $**
-Fo$@
$(OUTDIR)\alloc.obj: $(TEMACS_SRC)\alloc.c
***************
*** 1407,1428 ****
cd $(NT)
@echo Installing in $(INSTALL_DIR) ...
@echo PlaceHolder > PlaceHolder
! @xcopy /q PROBLEMS "$(INSTALL_DIR)\"
! @xcopy /q PlaceHolder "$(INSTALL_DIR)\lock\"
$(DEL) "$(INSTALL_DIR)\lock\PlaceHolder"
! @xcopy /q $(LIB_SRC)\*.exe
"$(INSTALL_DIR)\$(EMACS_CONFIGURATION)\"
! @copy $(LIB_SRC)\DOC "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)"
! @copy $(CONFIG_VALUES) "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)"
! @copy $(SRC)\xemacs.exe "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)"
! @xcopy /e /q $(XEMACS)\etc "$(INSTALL_DIR)\etc\"
! @xcopy /e /q $(XEMACS)\info "$(INSTALL_DIR)\info\"
! @xcopy /e /q $(XEMACS)\lisp "$(INSTALL_DIR)\lisp\"
@echo Making skeleton package tree in $(PACKAGE_PREFIX) ...
! @xcopy /q PlaceHolder "$(PACKAGE_PREFIX)\site-packages\"
$(DEL) "$(PACKAGE_PREFIX)\site-packages\PlaceHolder"
! @xcopy /q PlaceHolder "$(PACKAGE_PREFIX)\mule-packages\"
$(DEL) "$(PACKAGE_PREFIX)\mule-packages\PlaceHolder"
! @xcopy /q PlaceHolder "$(PACKAGE_PREFIX)\xemacs-packages\"
$(DEL) "$(PACKAGE_PREFIX)\xemacs-packages\PlaceHolder"
$(DEL) PlaceHolder
--- 1410,1431 ----
cd $(NT)
@echo Installing in $(INSTALL_DIR) ...
@echo PlaceHolder > PlaceHolder
! @$(COPY) PROBLEMS "$(INSTALL_DIR)\"
! @$(COPY) PlaceHolder "$(INSTALL_DIR)\lock\"
$(DEL) "$(INSTALL_DIR)\lock\PlaceHolder"
! @$(COPY) $(LIB_SRC)\*.exe
"$(INSTALL_DIR)\$(EMACS_CONFIGURATION)\"
! @$(COPY) $(LIB_SRC)\DOC "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)"
! @$(COPY) $(CONFIG_VALUES)
"$(INSTALL_DIR)\$(EMACS_CONFIGURATION)"
! @$(COPY) $(SRC)\xemacs.exe
"$(INSTALL_DIR)\$(EMACS_CONFIGURATION)"
! @$(COPYDIR) $(XEMACS)\etc "$(INSTALL_DIR)\etc\"
! @$(COPYDIR) $(XEMACS)\info "$(INSTALL_DIR)\info\"
! @$(COPYDIR) $(XEMACS)\lisp "$(INSTALL_DIR)\lisp\"
@echo Making skeleton package tree in $(PACKAGE_PREFIX) ...
! @$(COPY) PlaceHolder "$(PACKAGE_PREFIX)\site-packages\"
$(DEL) "$(PACKAGE_PREFIX)\site-packages\PlaceHolder"
! @$(COPY) PlaceHolder "$(PACKAGE_PREFIX)\mule-packages\"
$(DEL) "$(PACKAGE_PREFIX)\mule-packages\PlaceHolder"
! @$(COPY) PlaceHolder "$(PACKAGE_PREFIX)\xemacs-packages\"
$(DEL) "$(PACKAGE_PREFIX)\xemacs-packages\PlaceHolder"
$(DEL) PlaceHolder
--
ben
I'm sometimes slow in getting around to reading my mail, so if you
want to reach me faster, call 520-661-6661.
See
http://www.666.com/ben/chronic-pain/ for the hell I've been
through.