Clean up some imports

Author: sebastinas

.gitignore

@@ -5,7 +5,7 @@ doc/version.texi
 doc/yafc.info
 .deps
 yafc
-yafcrc.h
+src/yafcrc.h
 contrib/*.spec
 src/*.o
 src/ftp/*.o

Makefile.am

@@ -135,22 +135,21 @@ DEFS = -DLOCALEDIR=\"${YAFC_LOCALEDIR}\" \
 			 -DSYSCONFDIR=\"@sysconfdir@\" \
 			 @DEFS@
 
-BUILT_SOURCES = yafcrc.h
+BUILT_SOURCES = src/yafcrc.h
 
 AM_CPPFLAGS = $(BSD_CFLAGS) \
 							$(SSH_CFLAGS) \
 							$(EDITLINE_CFLAGS) \
 							-I$(top_srcdir)/src \
-							-I$(top_srcdir)/lib \
 							-I$(top_srcdir)/src/ftp \
 							-I$(top_srcdir)/src/libmhe
 
-yafcrc.h: $(top_srcdir)/samples/yafcrc
-	echo "const char *default_yafcrc = \"\"" > yafcrc.h
+src/yafcrc.h: $(top_srcdir)/samples/yafcrc
+	echo "const char *default_yafcrc = \"\"" > src/yafcrc.h
 	sed \
 		-e 's/\\/\\\\/g' \
 		-e 's/"/\\\"/g' \
 		-e 's/^\(.*\)$$/\"\1\\n\"/' \
 		< $(top_srcdir)/samples/yafcrc \
-		>> yafcrc.h
-	echo ";" >> yafcrc.h
+		>> src/yafcrc.h
+	echo ";" >> src/yafcrc.h

src/bookmark.c

@@ -14,7 +14,7 @@
 #include "ftp.h"
 #include "input.h"
 #include "gvars.h"
-#include "base64.h"
+#include "../../lib/base64.h"
 #include "commands.h"
 #include "shortpath.h"
 #include "strq.h"

src/ftp/url.c

@@ -13,9 +13,8 @@
 #include "syshdr.h"
 
 #include "url.h"
-#include "xmalloc.h"
 #include "strq.h"
-#include "base64.h"
+#include "../../lib/base64.h"
 
 void listify_string(const char *str, list *lp);
 

src/gvars.c

@@ -11,8 +11,8 @@
  */
 
 #include "syshdr.h"
-#include "ftp.h"
-#include "linklist.h"
+#include "ftp/ftp.h"
+#include "libmhe/linklist.h"
 #include "stats.h"
 
 /* time (in seconds) before a cached directory times out, 0 == never */

src/syshdr.h

@@ -32,7 +32,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include "../config.h"
 #endif
 
 #ifdef HAVE_SYS_TYPES_H
@@ -56,7 +56,7 @@
 #include <errno.h>
 #include <grp.h>
 
-#include "xmalloc.h"
+#include "libmhe/xmalloc.h"
 
 #include <sys/ioctl.h>
 
@@ -169,20 +169,20 @@ typedef CPPFunction rl_completion_func_t;
 #ifdef HAVE_FNMATCH_GNU
 #include <fnmatch.h>
 #else
-#include "fnmatch.h"  /* our own, in lib/ */
+#include "../lib/fnmatch.h"  /* our own, in lib/ */
 #endif
 
 #if defined(HAVE_GETOPT_LONG) && defined(HAVE_GETOPT_H)
 # include <getopt.h>
 #else
-# include "getopt.h"  /* our own, in lib/ */
+# include "../lib/getopt.h"  /* our own, in lib/ */
 #endif
 
 #define min(a, b) ((a) < (b) ? (a) : (b))
 
 #ifdef HAVE_KERBEROS
 # define SECFTP
-# include "security.h"  /* our own, in lib/ */
+# include "../lib/security.h"  /* our own, in lib/ */
 # ifndef HAVE_DECL_STRLCPY
 size_t strlcpy (char *dst, const char *src, size_t dst_sz);
 # endif