This commit was generated by cvs2svn to compensate for changes in r5670,

[chise/xemacs-chise.git.1] / netinstall / Makefile.in.in

diff --git a/netinstall/Makefile.in.in b/netinstall/Makefile.in.in
index 7ea3eb2..59dfb83 100644 (file)
--- a/netinstall/Makefile.in.in
+++ b/netinstall/Makefile.in.in
@@ -13,6 +13,8 @@
 ##
 ## Makefile for Cygwin installer
 
+## FIXME: integrate autoload.c so that wininet doesn't have to be linked.
+
 ## For performance and consistency, no built-in rules
 .SUFFIXES:
 .SUFFIXES: .c .cc .h .o
@@ -58,8 +60,6 @@ archlibdir=@archlibdir@
 configuration=@configuration@
 moduledir=@moduledir@
 sitemoduledir=@sitemoduledir@
-extra_includes=@extra_includes@
-blddir=@blddir@
 
 ## ==================== Utility Programs for the Build =================
 
@@ -78,8 +78,7 @@ program_transform_name = @program_transform_name@
 CC             = @CC@
 CC_FOR_TARGET  = $(CC)
 
-## -O3 has problems so fix this locally
-LOCALCFLAGS = $(CFLAGS) -O2 -DMINGW $(extra_includes)
+LOCALCFLAGS = $(CFLAGS) -DMINGW
 CXXFLAGS       = $(LOCALCFLAGS) -fno-exceptions -nostdinc++ -fno-rtti
 
 WINDRES                = windres
@@ -89,12 +88,10 @@ MINGW_CFLAGS        = $(LOCALCFLAGS) -mno-cygwin $(MINGW_INCLUDES) -mwindows
 MINGW_ZLIB_DIR = /usr/local/lib
 
 PROGS  = setup.exe
-XEMACS=${blddir}/src/${PROGNAME}
 
 CONFIG_H = ../src/config.h
 
 OBJS = \
-       autoload.o \
        choose.o \
        concat.o \
        desktop.o \
@@ -144,17 +141,10 @@ all: Makefile $(PROGS)
 setup.exe: $(OBJS)
        $(CXX) $(MINGW_CXXFLAGS) -o $@ $(OBJS) \
                -lole32 -lwsock32 -lnetapi32 -ladvapi32 \
-               -luuid -lkernel32 -luser32 \
+               -luuid -lkernel32 -luser32 -lwininet \
                -L$(MINGW_ZLIB_DIR) -lz -lmingw32
        @chmod a-x $@
 
-setup.ini: setup.exe
-       V=`grep '^\$$Revision.*' $(srcdir)/ChangeLog \
-       | sed -e 's/\$$Revision:* *//' \
-         -e 's/ *$$.*//'` ;\
-       $(XEMACS) -batch -vanilla -l ${srcdir}/../lisp/package-net.el \
-               -f package-net-batch-convert-index-to-ini . $$V
-
 install:
        @echo; echo "Installing net setup."
        for file in ${INSTALLABLES} ; do \
@@ -176,7 +166,7 @@ version.c : $(srcdir)/ChangeLog Makefile
        $(CC) $(MINGW_CFLAGS) -c -o $@ ${srcdir}/$<
 
 %.o: %.cc
-       $(CXX) $(MINGW_CXXFLAGS) -c -o $@ ${srcdir}/$<
+       $(CC) $(MINGW_CXXFLAGS) -c -o $@ ${srcdir}/$<
 
 iniparse.c iniparse.h : iniparse.y
        bison -d -o iniparse.c $(srcdir)/iniparse.y