Diff for /embedaddon/libxml2/win32/Makefile.bcb between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 23:37:58 version 1.1.1.2, 2014/06/15 19:53:38
Line 68  CFLAGS = $(CFLAGS) -DHAVE_PTHREAD_H Line 68  CFLAGS = $(CFLAGS) -DHAVE_PTHREAD_H
 !if "$(WITH_ZLIB)" == "1"  !if "$(WITH_ZLIB)" == "1"
 CFLAGS = $(CFLAGS) -DHAVE_ZLIB_H  CFLAGS = $(CFLAGS) -DHAVE_ZLIB_H
 !endif  !endif
   !if "$(WITH_LZMA)" == "1"
   CFLAGS = $(CFLAGS) -DHAVE_LZMA_H
   !endif
   
 # The linker and its options.  # The linker and its options.
 LD = ilink32.exe  LD = ilink32.exe
Line 92  LIBS = $(LIBS) iconvomf.lib Line 95  LIBS = $(LIBS) iconvomf.lib
 !if "$(WITH_ZLIB)" == "1"  !if "$(WITH_ZLIB)" == "1"
 LIBS = $(LIBS) zlibomf.lib  LIBS = $(LIBS) zlibomf.lib
 !endif  !endif
   !if "$(WITH_LZMA)" == "1"
   LIBS = $(LIBS) liblzma.lib
   !endif
 !if "$(WITH_THREADS)" == "posix"  !if "$(WITH_THREADS)" == "posix"
 LIBS = $(LIBS) pthreadVC.lib  LIBS = $(LIBS) pthreadVC.lib
 !endif  !endif
Line 113  LDFLAGS = $(LDFLAGS) Line 119  LDFLAGS = $(LDFLAGS)
 !endif  !endif
   
 # Libxml object files.  # Libxml object files.
XML_OBJS = $(XML_INTDIR)\c14n.obj\XML_OBJS = $(XML_INTDIR)\buf.obj\
         $(XML_INTDIR)\c14n.obj\
         $(XML_INTDIR)\catalog.obj\          $(XML_INTDIR)\catalog.obj\
         $(XML_INTDIR)\chvalid.obj\          $(XML_INTDIR)\chvalid.obj\
         $(XML_INTDIR)\debugXML.obj\          $(XML_INTDIR)\debugXML.obj\
Line 158  XML_OBJS = $(XML_INTDIR)\c14n.obj\ Line 165  XML_OBJS = $(XML_INTDIR)\c14n.obj\
         $(XML_INTDIR)\xmlstring.obj          $(XML_INTDIR)\xmlstring.obj
   
 # Static libxml object files.  # Static libxml object files.
XML_OBJS_A = $(XML_INTDIR_A)\c14n.obj\XML_OBJS_A = $(XML_INTDIR_A)\buf.obj\
         $(XML_INTDIR_A)\c14n.obj\
         $(XML_INTDIR_A)\catalog.obj\          $(XML_INTDIR_A)\catalog.obj\
         $(XML_INTDIR_A)\chvalid.obj\          $(XML_INTDIR_A)\chvalid.obj\
         $(XML_INTDIR_A)\debugXML.obj\          $(XML_INTDIR_A)\debugXML.obj\
Line 219  UTILS = $(BINDIR)\xmllint.exe\ Line 227  UTILS = $(BINDIR)\xmllint.exe\
         $(BINDIR)\testXPath.exe\          $(BINDIR)\testXPath.exe\
         $(BINDIR)\runtest.exe\          $(BINDIR)\runtest.exe\
         $(BINDIR)\runsuite.exe\          $(BINDIR)\runsuite.exe\
        $(BINDIR)\testapi.exe        $(BINDIR)\testapi.exe\
         $(BINDIR)\testlimits.exe
   
   
 !if "$(WITH_THREADS)" == "yes" || "$(WITH_THREADS)" == "ctls" || "$(WITH_THREADS)" == "native"  !if "$(WITH_THREADS)" == "yes" || "$(WITH_THREADS)" == "ctls" || "$(WITH_THREADS)" == "native"
Line 250  distclean : clean Line 259  distclean : clean
 rebuild : clean all  rebuild : clean all
   
 install-libs : all  install-libs : all
        if not exist "$(INCPREFIX)\libxml" mkdir "$(INCPREFIX)\libxml"        if not exist "$(INCPREFIX)\libxml2" mkdir "$(INCPREFIX)\libxml2"
         if not exist "$(INCPREFIX)\libxml2\libxml" mkdir "$(INCPREFIX)\libxml2\libxml"
         if not exist "$(BINPREFIX)" mkdir "$(BINPREFIX)"          if not exist "$(BINPREFIX)" mkdir "$(BINPREFIX)"
         if not exist "$(LIBPREFIX)" mkdir "$(LIBPREFIX)"          if not exist "$(LIBPREFIX)" mkdir "$(LIBPREFIX)"
        copy $(XML_SRCDIR)\include\libxml\*.h "$(INCPREFIX)\libxml"        copy $(XML_SRCDIR)\include\libxml\*.h "$(INCPREFIX)\libxml2\libxml"
         copy $(BINDIR)\$(XML_SO) "$(SOPREFIX)"          copy $(BINDIR)\$(XML_SO) "$(SOPREFIX)"
         copy $(BINDIR)\$(XML_A) "$(LIBPREFIX)"          copy $(BINDIR)\$(XML_A) "$(LIBPREFIX)"
         copy $(BINDIR)\$(XML_IMP) "$(LIBPREFIX)"          copy $(BINDIR)\$(XML_IMP) "$(LIBPREFIX)"

Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>