]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
Merge pull request #1368 from rkjain89/test-branch
authorYann Collet <Cyan4973@users.noreply.github.com>
Fri, 19 Oct 2018 23:31:10 +0000 (16:31 -0700)
committerGitHub <noreply@github.com>
Fri, 19 Oct 2018 23:31:10 +0000 (16:31 -0700)
Moving Code To util.c

1  2 
build/cmake/programs/CMakeLists.txt
programs/Makefile

index 7c01b4c5b8b1b3cf7a70a176f4b9e440054bdd0b,708d2b27fa530492fcf58ffa283a64c0afd8198d..ef60a2dda026c8214bc094ac19641ba949f11ba0
@@@ -61,10 -55,8 +61,10 @@@ IF (UNIX
      INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zstd.1 DESTINATION "${MAN_INSTALL_DIR}")
      INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zstdcat.1 DESTINATION "${MAN_INSTALL_DIR}")
      INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/unzstd.1 DESTINATION "${MAN_INSTALL_DIR}")
 +    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zstdgrep.1 DESTINATION "${MAN_INSTALL_DIR}")
 +    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zstdless.1 DESTINATION "${MAN_INSTALL_DIR}")
  
-     ADD_EXECUTABLE(zstd-frugal ${PROGRAMS_DIR}/zstdcli.c ${PROGRAMS_DIR}/fileio.c)
+     ADD_EXECUTABLE(zstd-frugal ${PROGRAMS_DIR}/zstdcli.c ${PROGRAMS_DIR}/util.c ${PROGRAMS_DIR}/fileio.c)
      TARGET_LINK_LIBRARIES(zstd-frugal libzstd_static)
      SET_PROPERTY(TARGET zstd-frugal APPEND PROPERTY COMPILE_DEFINITIONS "ZSTD_NOBENCH;ZSTD_NODICT")
  ENDIF (UNIX)
Simple merge