$NetBSD: patch-ab,v 1.2 2002/08/16 10:36:26 dmcmahill Exp $

--- src/Makefile.in.orig	Thu May 23 20:05:19 2002
+++ src/Makefile.in
@@ -370,6 +370,8 @@
 	lyx_main.h \
 	lyx_sty.C \
 	lyx_sty.h \
+	lyxcodeconv.C \
+	lyxcodeconv.h \
 	lyxcursor.C \
 	lyxcursor.h \
 	lyxfont.C \
@@ -380,6 +382,8 @@
 	lyxfunc.h \
 	lyxgluelength.C \
 	lyxgluelength.h \
+	lyxim.C \
+	lyxim.h \
 	lyxlayout.C \
 	lyxlayout.h \
 	lyxlength.C \
@@ -476,6 +480,7 @@
 	kbsequence.$(OBJEXT) language.$(OBJEXT) lastfiles.$(OBJEXT) \
 	lengthcommon.$(OBJEXT) lyx_cb.$(OBJEXT) lyx_gui.$(OBJEXT) \
 	lyx_main.$(OBJEXT) lyx_sty.$(OBJEXT) lyxcursor.$(OBJEXT) \
+	lyxcodeconv.$(OBJEXT) lyxim.$(OBJEXT) \
 	lyxfont.$(OBJEXT) lyxfind.$(OBJEXT) lyxfunc.$(OBJEXT) \
 	lyxgluelength.$(OBJEXT) lyxlayout.$(OBJEXT) lyxlength.$(OBJEXT) \
 	lyxlex.$(OBJEXT) lyxlex_pimpl.$(OBJEXT) lyxlookup.$(OBJEXT) \
@@ -548,6 +548,11 @@ depcomp = $(SHELL) $(top_srcdir)/config/
 @AMDEP_TRUE@	$(DEPDIR)/undo_funcs.Po $(DEPDIR)/undostack.Po \
 @AMDEP_TRUE@	$(DEPDIR)/vc-backend.Po $(DEPDIR)/version.Po \
 @AMDEP_TRUE@	$(DEPDIR)/vspace.Po
+CXXCOMPILE_NOOPT = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) $(AM_CXXFLAGS) $(CXXFLAGS_NOOPT)
+LTCXXCOMPILE_NOOPT = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) \
+	$(AM_CXXFLAGS) $(CXXFLAGS_NOOPT)
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
@@ -558,6 +563,8 @@ CXXLINK = $(LIBTOOL) --mode=link $(CXXLD
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 CXXFLAGS = @CXXFLAGS@
 CFLAGS = @CFLAGS@
+CPPFLAGS_NOOPT = $(CPPFLAGS:C/-O[0-9]*//)
+CXXFLAGS_NOOPT = $(CXXFLAGS:C/-O[0-9]*//)
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
@@ -579,8 +586,15 @@ SOURCES = $(lyx_SOURCES)
 all: $(BUILT_SOURCES) config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
+buffer.o: buffer.cc
+buffer.lo: buffer.cc
+lyxfunc.o: lyxfunc.cc
+lyxfunc.lo: lyxfunc.cc
+tex-accent.o: tex-accent.cc
+tex-accent.lo: tex-accent.cc
+
 .SUFFIXES:
-.SUFFIXES: .C .lo .o .obj
+.SUFFIXES: .C .cc .lo .o .obj
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -752,6 +766,14 @@ distclean-compile:
 
 distclean-depend:
 	-rm -rf $(DEPDIR)
+.C.cc:
+	cp -f $< $@
+
+.cc.o:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CXXCOMPILE_NOOPT) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
 
 .C.o:
 @AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -764,6 +786,12 @@ distclean-depend:
 @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 	$(CXXCOMPILE) -c -o $@ `cygpath -w $<`
+
+.cc.lo:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(LTCXXCOMPILE_NOOPT) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
 
 .C.lo:
 @AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@