move pop into lib-mx.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 68bcb36..d78ab7e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -310,7 +310,6 @@ MADMUTT_SOURCES(madmuttsrc madmuttgen
     mutt_sasl.c
     pager.c
     pattern.c
     mutt_sasl.c
     pager.c
     pattern.c

-    pop.c

     postpone.c
     recvattach.c
     recvcmd.c
     postpone.c
     recvattach.c
     recvcmd.c


@@ -325,7 +324,7 @@ MADMUTT_SOURCES(madmuttsrc madmuttgen
 
 STRING(REGEX REPLACE ";" " " MUTTLIBS "${MUTTLIBS}")
 ADD_EXECUTABLE(madmutt ${madmuttsrc})
 
 STRING(REGEX REPLACE ";" " " MUTTLIBS "${MUTTLIBS}")
 ADD_EXECUTABLE(madmutt ${madmuttsrc})

-TARGET_LINK_LIBRARIES(madmutt mime sys mx lua ui imap lib)
+TARGET_LINK_LIBRARIES(madmutt ui mx lua imap mime sys lib)

 SET_TARGET_PROPERTIES(madmutt PROPERTIES
     LINK_FLAGS "${MUTTLIBS}"
     #    LINKER_LANGUAGE D
 SET_TARGET_PROPERTIES(madmutt PROPERTIES
     LINK_FLAGS "${MUTTLIBS}"
     #    LINKER_LANGUAGE D

diff --git a/lib-mx/CMakeLists.txt b/lib-mx/CMakeLists.txt
index ba7a6c8..445cff7 100644 (file)
--- a/lib-mx/CMakeLists.txt
+++ b/lib-mx/CMakeLists.txt
@@ -1,7 +1,8 @@
 ADD_LIBRARY(mx
 ADD_LIBRARY(mx

-    mx.c
-    mh.c
-    mbox.c

     compress.c
     hcache.c
     compress.c
     hcache.c

+    mbox.c
+    mh.c
+    mx.c
+    pop.c

 )
 )

diff --git a/pop.c b/lib-mx/pop.c
similarity index 100%
rename from pop.c
rename to lib-mx/pop.c

diff --git a/pop.h b/lib-mx/pop.h
similarity index 100%
rename from pop.h
rename to lib-mx/pop.h

diff --git a/lib-ui/curs_main.c b/lib-ui/curs_main.c
index 6a40a00..0c1e85e 100644 (file)
--- a/lib-ui/curs_main.c
+++ b/lib-ui/curs_main.c
@@ -12,7 +12,7 @@
 
 #include <lib-ui/lib-ui.h>
 #include <lib-mx/mx.h>
 
 #include <lib-ui/lib-ui.h>
 #include <lib-mx/mx.h>

-#include "pop.h"
+#include <lib-mx/pop.h>

 
 #include "menu.h"
 
 
 #include "menu.h"