diff options
Diffstat (limited to 'print/cjk-lyx/patches/patch-ab')
| -rw-r--r-- | print/cjk-lyx/patches/patch-ab | 75 |
1 files changed, 64 insertions, 11 deletions
diff --git a/print/cjk-lyx/patches/patch-ab b/print/cjk-lyx/patches/patch-ab index 1ce33f93564..e6d0235d332 100644 --- a/print/cjk-lyx/patches/patch-ab +++ b/print/cjk-lyx/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/07/19 12:32:32 agc Exp $ +$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 @@ -28,16 +28,69 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/07/19 12:32:32 agc Exp $ lyxfont.$(OBJEXT) lyxfind.$(OBJEXT) lyxfunc.$(OBJEXT) \ lyxgluelength.$(OBJEXT) lyxlayout.$(OBJEXT) lyxlength.$(OBJEXT) \ lyxlex.$(OBJEXT) lyxlex_pimpl.$(OBJEXT) lyxlookup.$(OBJEXT) \ -@@ -651,6 +656,12 @@ - lyx$(EXEEXT): $(lyx_OBJECTS) $(lyx_DEPENDENCIES) - @rm -f lyx$(EXEEXT) - $(CXXLINK) $(lyx_LDFLAGS) $(lyx_OBJECTS) $(lyx_LDADD) $(LIBS) +@@ -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 + -+lyxfunc.o: lyxfunc.C -+ $(CXX) $(DEFS) -I. $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) -O -c $< + .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 $<` + -+lyxfunc.lo: lyxfunc.C -+ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) -I. $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) -O -c $< ++.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)/'`$< - mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core + .C.lo: + @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ |