Ticket #9176: 110_make_fix.patch

File 110_make_fix.patch, 1.7 KB (added by cbradley <cameron.bradley@…>, 7 years ago)

Updated 110_make_fix.patch from #9001 to match latest trunk.

  • Makefile.am

    diff -ru a/Makefile.am b/Makefile.am
    a b  
    253253$(libfreeswitch_la_SOURCES): $(CORE_LIBS) $(switch_builddir)/quiet_libtool $(switch_builddir)/modules.conf   
    254254 
    255255src/include/switch_swigable_cpp.h: $(switch_srcdir)/src/include/switch_cpp.h 
    256         $(CC) -E $(switch_srcdir)/src/include/switch_cpp.h -DSWITCH_DECLARE_CLASS= -DSWITCH_DECLARE\(x\)=x -DSWITCH_DECLARE_CONSTRUCTOR= -DSWITCH_DECLARE_NONSTD\(x\)=x 2>/dev/null | grep -v "^#" > src/include/switch_swigable_cpp.h  
     256        $(CC) $(CFLAGS) -E $(switch_srcdir)/src/include/switch_cpp.h -DSWITCH_DECLARE_CLASS= -DSWITCH_DECLARE\(x\)=x -DSWITCH_DECLARE_CONSTRUCTOR= -DSWITCH_DECLARE_NONSTD\(x\)=x 2>/dev/null | grep -v "^#" > src/include/switch_swigable_cpp.h  
    257257 
    258258 
    259259## 
  • Makefile.in

    diff -ru a/Makefile.in b/Makefile.in
    a b  
    19951995$(libfreeswitch_la_SOURCES): $(CORE_LIBS) $(switch_builddir)/quiet_libtool $(switch_builddir)/modules.conf   
    19961996 
    19971997src/include/switch_swigable_cpp.h: $(switch_srcdir)/src/include/switch_cpp.h 
    1998         $(CC) -E $(switch_srcdir)/src/include/switch_cpp.h -DSWITCH_DECLARE_CLASS= -DSWITCH_DECLARE\(x\)=x -DSWITCH_DECLARE_CONSTRUCTOR= -DSWITCH_DECLARE_NONSTD\(x\)=x 2>/dev/null | grep -v "^#" > src/include/switch_swigable_cpp.h  
     1998        $(CC) $(CFLAGS) -E $(switch_srcdir)/src/include/switch_cpp.h -DSWITCH_DECLARE_CLASS= -DSWITCH_DECLARE\(x\)=x -DSWITCH_DECLARE_CONSTRUCTOR= -DSWITCH_DECLARE_NONSTD\(x\)=x 2>/dev/null | grep -v "^#" > src/include/switch_swigable_cpp.h  
    19991999 
    20002000scripts/fsxs: scripts/fsxs.in 
    20012001        @echo creating fsxs