summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/BHeap.cc3
-rw-r--r--lib/Makefile.am8
2 files changed, 6 insertions, 5 deletions
diff --git a/lib/BHeap.cc b/lib/BHeap.cc
index ef4bd04..89d6f0f 100644
--- a/lib/BHeap.cc
+++ b/lib/BHeap.cc
@@ -312,7 +312,8 @@ Key_t BHeap::Extract_Min(Datas_t & Datas)
/*
- * Implémentation directe de l'algorithme UNION-TAS-BINOMIAUX(T1, T2) avec T1 = this.
+ * Implémentation de l'algorithme UNION-TAS-BINOMIAUX(T1, T2) avec T1 = this.
+ * Il y a quelques changements par rapport a l'algorithme du cormen (voir rapport)
*/
PriorityList *BHeap::Union(PriorityList * P)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 10ae1fd..c195459 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -3,10 +3,10 @@ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
AM_CFLAGS = -O3 -Wall -Wstrict-prototypes $(CFLAGS)
AM_CXXFLAGS = -O3 -Wall -Wstrict-prototypes $(CXXFLAGS)
INCLUDES = -I. -I.. -I$(includedir) -I../include
-lib_LTLIBRARIES = libPriorityLists.la
+lib_LTLIBRARIES = libPriorityLists.la libHuffman.la
-libPriorityLists_la_SOURCES = PCommon.cc BHeap.cc FHeap.cc BinHeap.cc PLList.cc CList.cc SList.cc HTree.cc Huffman.cc
+libPriorityLists_la_SOURCES = PCommon.cc BHeap.cc FHeap.cc BinHeap.cc PLList.cc CList.cc SList.cc
+libHuffman_la_SOURCES = HTree.cc Huffman.cc numbers.c
libPriorityLists_la_LDFLAGS = -version-info $(PriorityLists_VERSION_INFO)
-
-EXTRA_DIST = FHeap.cc \ No newline at end of file
+libHuffman_la_LDFLAGS = -version-info $(PriorityLists_VERSION_INFO)