--- CMakeLists.txt.orig	2016-06-30 19:30:28 UTC
+++ CMakeLists.txt
@@ -31,11 +31,14 @@ add_definitions(-D_GNU_SOURCE -DDWARVES_
 find_package(DWARF REQUIRED)
 find_package(ZLIB REQUIRED)
 
-_set_fancy(LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}${CMAKE_INSTALL_PREFIX}/${__LIB}" "libdir")
+# For argp-standalone
+find_library(ARGP argp ${LOCALBASE}/lib)
+
+_set_fancy(LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}${CMAKE_INSTALL_PREFIX}/lib${__LIB}" "libdir")
 
 set(dwarves_LIB_SRCS dwarves.c dwarves_fprintf.c gobuffer strings
 		     ctf_encoder.c ctf_loader.c libctf.c dwarf_loader.c
-		     dutil.c elf_symtab.c rbtree.c)
+		     dutil.c elf_symtab.c rbtree.c obstack.c)
 add_library(dwarves SHARED ${dwarves_LIB_SRCS})
 set_target_properties(dwarves PROPERTIES VERSION 1.0.0 SOVERSION 1)
 set_target_properties(dwarves PROPERTIES INTERFACE_LINK_LIBRARIES "")
@@ -53,11 +56,11 @@ target_link_libraries(dwarves_reorganize
 
 set(codiff_SRCS codiff.c)
 add_executable(codiff ${codiff_SRCS})
-target_link_libraries(codiff dwarves)
+target_link_libraries(codiff dwarves ${ARGP})
 
 set(ctracer_SRCS ctracer.c)
 add_executable(ctracer ${ctracer_SRCS})
-target_link_libraries(ctracer dwarves dwarves_emit dwarves_reorganize ${ELF_LIBRARY})
+target_link_libraries(ctracer dwarves dwarves_emit dwarves_reorganize ${ELF_LIBRARY} ${ARGP})
 
 set(dtagnames_SRCS dtagnames.c)
 add_executable(dtagnames ${dtagnames_SRCS})
@@ -65,19 +68,19 @@ target_link_libraries(dtagnames dwarves)
 
 set(pahole_SRCS pahole.c)
 add_executable(pahole ${pahole_SRCS})
-target_link_libraries(pahole dwarves dwarves_reorganize)
+target_link_libraries(pahole dwarves dwarves_reorganize ${ARGP})
 
 set(pdwtags_SRCS pdwtags.c)
 add_executable(pdwtags ${pdwtags_SRCS})
-target_link_libraries(pdwtags dwarves)
+target_link_libraries(pdwtags dwarves ${ARGP})
 
 set(pglobal_SRCS pglobal.c)
 add_executable(pglobal ${pglobal_SRCS})
-target_link_libraries(pglobal dwarves)
+target_link_libraries(pglobal dwarves ${ARGP})
 
 set(pfunct_SRCS pfunct.c )
 add_executable(pfunct ${pfunct_SRCS})
-target_link_libraries(pfunct dwarves dwarves_emit ${ELF_LIBRARY})
+target_link_libraries(pfunct dwarves dwarves_emit ${ELF_LIBRARY} ${ARGP})
 
 set(prefcnt_SRCS prefcnt.c)
 add_executable(prefcnt ${prefcnt_SRCS})
@@ -89,7 +92,7 @@ target_link_libraries(scncopy dwarves ${
 
 set(syscse_SRCS syscse.c)
 add_executable(syscse ${syscse_SRCS})
-target_link_libraries(syscse dwarves)
+target_link_libraries(syscse dwarves ${ARGP})
 
 install(TARGETS codiff ctracer dtagnames pahole pdwtags
 		pfunct pglobal prefcnt scncopy syscse RUNTIME DESTINATION