$NetBSD: patch-ac,v 1.5 2005/11/17 13:17:56 dmcmahill Exp $ --- src/Makefile.in.orig 2005-08-30 07:58:00.000000000 +0000 +++ src/Makefile.in @@ -38,7 +38,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = ngspice$(EXEEXT) ngnutmeg$(EXEEXT) nghelp$(EXEEXT) \ - makeidx$(EXEEXT) $(am__EXEEXT_1) + ngmakeidx$(EXEEXT) $(am__EXEEXT_1) @WINDOWS_FALSE@am__append_1 = ngsconvert ngproc2mod ngmultidec @WINDOWS_TRUE@am__append_2 = winmain.c @WINDOWS_TRUE@am__append_3 = winmain.c @@ -59,9 +59,9 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(initdatadir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) -am_makeidx_OBJECTS = makeidx.$(OBJEXT) -makeidx_OBJECTS = $(am_makeidx_OBJECTS) -makeidx_LDADD = $(LDADD) +am_ngmakeidx_OBJECTS = makeidx.$(OBJEXT) +ngmakeidx_OBJECTS = $(am_ngmakeidx_OBJECTS) +ngmakeidx_LDADD = $(LDADD) am__nghelp_SOURCES_DIST = conf.c nghelp.c winmain.c @WINDOWS_TRUE@am__objects_1 = winmain.$(OBJEXT) am_nghelp_OBJECTS = conf.$(OBJEXT) nghelp.$(OBJEXT) $(am__objects_1) @@ -151,10 +151,10 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=c CCLD = $(CC) LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(makeidx_SOURCES) $(nghelp_SOURCES) $(ngmultidec_SOURCES) \ +SOURCES = $(ngmakeidx_SOURCES) $(nghelp_SOURCES) $(ngmultidec_SOURCES) \ $(ngnutmeg_SOURCES) $(ngproc2mod_SOURCES) \ $(ngsconvert_SOURCES) $(ngspice_SOURCES) -DIST_SOURCES = $(makeidx_SOURCES) $(am__nghelp_SOURCES_DIST) \ +DIST_SOURCES = $(ngmakeidx_SOURCES) $(am__nghelp_SOURCES_DIST) \ $(am__ngmultidec_SOURCES_DIST) $(am__ngnutmeg_SOURCES_DIST) \ $(am__ngproc2mod_SOURCES_DIST) $(am__ngsconvert_SOURCES_DIST) \ $(am__ngspice_SOURCES_DIST) @@ -427,7 +427,7 @@ nghelp_LDADD = \ @WINDOWS_FALSE@ maths/sparse/libsparse.a \ @WINDOWS_FALSE@ misc/libmisc.a -makeidx_SOURCES = makeidx.c +ngmakeidx_SOURCES = makeidx.c INCLUDES = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices @X_CFLAGS@ MAINTAINERCLEANFILES = Makefile.in all: all-recursive @@ -493,9 +493,9 @@ clean-binPROGRAMS: echo " rm -f $$p $$f"; \ rm -f $$p $$f ; \ done -makeidx$(EXEEXT): $(makeidx_OBJECTS) $(makeidx_DEPENDENCIES) - @rm -f makeidx$(EXEEXT) - $(LINK) $(makeidx_LDFLAGS) $(makeidx_OBJECTS) $(makeidx_LDADD) $(LIBS) +ngmakeidx$(EXEEXT): $(ngmakeidx_OBJECTS) $(ngmakeidx_DEPENDENCIES) + @rm -f ngmakeidx$(EXEEXT) + $(LINK) $(ngmakeidx_LDFLAGS) $(ngmakeidx_OBJECTS) $(ngmakeidx_LDADD) $(LIBS) nghelp$(EXEEXT): $(nghelp_OBJECTS) $(nghelp_DEPENDENCIES) @rm -f nghelp$(EXEEXT) $(LINK) $(nghelp_LDFLAGS) $(nghelp_OBJECTS) $(nghelp_LDADD) $(LIBS) @@ -881,8 +881,8 @@ winmain.o: winmain.c spice.o: main.c $(COMPILE) -DSIMULATOR -o spice.o -c $(srcdir)/main.c -ngspice.idx: makeidx - ./makeidx $(srcdir)/ngspice.txt +ngspice.idx: ngmakeidx + ./ngmakeidx $(srcdir)/ngspice.txt # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: