3 files changed, 29 insertions, 10 deletions
diff --git a/lib/chmlib/CMakeLists.txt b/lib/chmlib/CMakeLists.txt
new file mode 100644
index 0000000..738a4b5
--- /dev/null
+++ b/lib/chmlib/CMakeLists.txt
@@ -0,0 +1,22 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### chm (static)
+
+tde_add_library( chm STATIC_PIC
+
+  SOURCES
+        chm_lib.c
+        lzx.c
+)
diff --git a/lib/chmlib/Makefile.am b/lib/chmlib/Makefile.am
deleted file mode 100644
index bcbe427..0000000
--- a/lib/chmlib/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-noinst_LTLIBRARIES = libchm.la
-noinst_HEADERS = chm_lib.h lzx.h
-libchm_la_SOURCES = chm_lib.c lzx.c
diff --git a/lib/chmlib/lzx.c b/lib/chmlib/lzx.c
index 7a5545b..b189439 100644
--- a/lib/chmlib/lzx.c
+++ b/lib/chmlib/lzx.c
@@ -346,9 +346,9 @@ int LZXreset(struct LZXstate *pState)
  */
 
 static int make_decode_table(ULONG nsyms, ULONG nbits, UBYTE *length, UWORD *table) {
-    register UWORD sym;
-    register ULONG leaf;
-    register UBYTE bit_num = 1;
+    UWORD sym;
+    ULONG leaf;
+    UBYTE bit_num = 1;
     ULONG fill;
     ULONG pos         = 0; /* the current position in the decode table */
     ULONG table_mask  = 1 << nbits;
@@ -425,8 +425,8 @@ static int lzx_read_lens(struct LZXstate *pState, UBYTE *lens, ULONG first, ULON
     ULONG i,j, x,y;
     int z;
 
-    register ULONG bitbuf = lb->bb;
-    register int bitsleft = lb->bl;
+    ULONG bitbuf = lb->bb;
+    int bitsleft = lb->bl;
     UBYTE *inpos = lb->ip;
     UWORD *hufftbl;
 
@@ -476,8 +476,8 @@ int LZXdecompress(struct LZXstate *pState, unsigned char *inpos, unsigned char *
     ULONG R1 = pState->R1;
     ULONG R2 = pState->R2;
 
-    register ULONG bitbuf;
-    register int bitsleft;
+    ULONG bitbuf;
+    int bitsleft;
     ULONG match_offset, i,j,k; /* ijk used in READ_HUFFSYM macro */
     struct lzx_bits lb; /* used in READ_LENGTHS macro */