build: get out of tree build working.

Move src/enc/ files directly into src/ to avoid complexity. Move man makefile rule directly into src.
Cigaes · Dec 3, 2014 · 20edc1b · 20edc1b
1 parent 68b93f8
commit 20edc1b
Show file tree

Hide file tree

Showing 48 changed files with 69 additions and 79 deletions.
diff --git a/configure b/configure
@@ -1142,9 +1142,6 @@ fi
 
 ROOTDIR=`pwd`
 
-CPPFLAGS="-I. $CPPFLAGS"
-
-
 flrn_cv_slang=no
 # Check whether --with-slang or --without-slang was given.
 if test "${with_slang+set}" = set; then

diff --git a/configure.in b/configure.in
@@ -68,9 +68,6 @@ fi
 
 ROOTDIR=`pwd`
 
-CPPFLAGS="-I. $CPPFLAGS"
-
-
 flrn_cv_slang=no
 AC_ARG_WITH(slang, [  --with-slang[=DIR]       use S-Lang in dir DIR],
         AC_MSG_CHECKING(for S-Lang)

diff --git a/man/Makefile b/man/Makefile
diff --git a/src/Makefile.in b/src/Makefile.in
@@ -11,7 +11,7 @@
 
 CC = @CC@
 DEBUGFLAGS = 
-CPPFLAGS = $(DEBUGFLAGS) @CPPFLAGS@
+CPPFLAGS = $(DEBUGFLAGS) -I. -I$(SRCDIR) @CPPFLAGS@
 CFLAGS = -D_GNU_SOURCE @CFLAGS@
 LDFLAGS = @LDFLAGS@
 MISCLIBS = @LIBS@
@@ -43,23 +43,23 @@ localedir = $(datadir)/locale
 
 Y_FILES = getdate.y
 
-C_FILES = flrn_tcp.c options.c flrn_files.c group.c art_group.c tty_display.c tty_keyboard.c flrn_inter.c post.c main.c rfc2047.c flrn_help.c flrn_regexp.c flrn_slang.c flrn_xover.c flrn_menus.c flrn_color.c compatibility.c flrn_shell.c flrn_pager.c flrn_format.c flrn_filter.c flrn_lists.c flrn_tags.c flrn_command.c flrn_comp.c flrn_messages.c flrn_func.c slang_flrn.c version.c enc/enc_strings.c
+C_FILES = flrn_tcp.c options.c flrn_files.c group.c art_group.c tty_display.c tty_keyboard.c flrn_inter.c post.c main.c rfc2047.c flrn_help.c flrn_regexp.c flrn_slang.c flrn_xover.c flrn_menus.c flrn_color.c compatibility.c flrn_shell.c flrn_pager.c flrn_format.c flrn_filter.c flrn_lists.c flrn_tags.c flrn_command.c flrn_comp.c flrn_messages.c flrn_func.c slang_flrn.c version.c enc_strings.c
 
-VC_FILES = `echo $(C_FILES) $(Y_FILES) | sed s'&\ \|^& '$(SRCDIR)'/&'g`
+VC_FILES = `echo $(C_FILES) | sed s'&\ \|^& '$(SRCDIR)'/&'g` $(Y_FILES)
 
 #Headers
 
-HDRS = flrn.h options.h flrn_config.h flrn_glob.h group.h art_group.h post.h rfc2047.h pathdef.h version.h site_config.h flrn_slang.h flrn_menus.h flrn_filter.h flrn_pager.h flrn_lists.h flrn_tags.h flrn_tcp.h flrn_macros.h flrn_command.h compatibility.h config.h flrn_color.h flrn_files.h flrn_format.h flrn_help.h flrn_inter.h flrn_regexp.h flrn_shell.h flrn_xover.h tty_display.h tty_keyboard.h flrn_comp.h flrn_messages.h getdate.h flrn_func.h slang_flrn.h enc/enc_base.h enc/enc_strings.h
+HDRS = flrn.h options.h flrn_config.h flrn_glob.h group.h art_group.h post.h rfc2047.h pathdef.h version.h site_config.h flrn_slang.h flrn_menus.h flrn_filter.h flrn_pager.h flrn_lists.h flrn_tags.h flrn_tcp.h flrn_macros.h flrn_command.h compatibility.h config.h flrn_color.h flrn_files.h flrn_format.h flrn_help.h flrn_inter.h flrn_regexp.h flrn_shell.h flrn_xover.h tty_display.h tty_keyboard.h flrn_comp.h flrn_messages.h getdate.h flrn_func.h slang_flrn.h enc_base.h enc_strings.h
 
 #Objets
 
-OBJS = art_group.o compatibility.o flrn_color.o flrn_files.o flrn_format.o flrn_help.o flrn_inter.o flrn_menus.o flrn_pager.o flrn_regexp.o flrn_shell.o flrn_slang.o flrn_tcp.o flrn_xover.o group.o main.o options.o post.o rfc2047.o tty_display.o tty_keyboard.o flrn_filter.o flrn_lists.o flrn_tags.o flrn_command.o flrn_comp.o flrn_messages.o getdate.o flrn_func.o slang_flrn.o version.o enc/enc_strings.o
+OBJS = art_group.o compatibility.o flrn_color.o flrn_files.o flrn_format.o flrn_help.o flrn_inter.o flrn_menus.o flrn_pager.o flrn_regexp.o flrn_shell.o flrn_slang.o flrn_tcp.o flrn_xover.o group.o main.o options.o post.o rfc2047.o tty_display.o tty_keyboard.o flrn_filter.o flrn_lists.o flrn_tags.o flrn_command.o flrn_comp.o flrn_messages.o getdate.o flrn_func.o slang_flrn.o version.o enc_strings.o
 
 TBLS = @TBLS@
 
 # Suite a modifier au cas où
 
-all:  flrn $(ROOTDIR)/man/flrn.1$(MANISO)
+all:  flrn flrn.1$(MANISO)
 
 do_chartrans_stuff: ${TBLS}
 	-cd chrtrans && $(MAKE) tables
@@ -82,16 +82,16 @@ installhelp:
 	$(INSTALL) -d -m 755 ${DESTDIR}$(helpdir)
 	for i in $(ROOTDIR)/help/Help* ; do $(INSTALL) -m 644 $$i ${DESTDIR}$(helpdir); done
 
-installman: $(ROOTDIR)/man/flrn.1$(MANISO)
+installman: flrn.1$(MANISO)
 	$(INSTALL) -d -m 755 ${DESTDIR}$(mandir)/man1
-	$(INSTALL) -m 644 $(ROOTDIR)/man/flrn.1$(MANISO) ${DESTDIR}$(mandir)/man1/flrn.1
+	$(INSTALL) -m 644 flrn.1$(MANISO) ${DESTDIR}$(mandir)/man1/flrn.1
 
 depend: pathdef.h
 	$(MAKEDEPEND) $(CPPFLAGS) $(VC_FILES) -I.
 	+ cd chrtrans && $(MAKE) depend
 
-$(ROOTDIR)/man/flrn.1: $(ROOTDIR)/man/flrn.1.iso
-	+ cd $(ROOTDIR)/man; ${MAKE}
+flrn.1: $(ROOTDIR)/man/flrn.1.iso $(ROOTDIR)/man/zapaccents
+	LC_ALL=C sed -f $(ROOTDIR)/man/zapaccents $< > $@
 
 pathdef.h: Makefile
 	rm -f pathdef.h

diff --git a/src/art_group.h b/src/art_group.h
@@ -18,7 +18,7 @@
 #endif
 #include <sys/times.h>
 
-#include "enc/enc_base.h"
+#include "enc_base.h"
 
 typedef struct Flrn_known_headers {
    char *header;

diff --git a/src/chrtrans/Makefile.in b/src/chrtrans/Makefile.in
@@ -12,7 +12,7 @@
 
 CC = @CC@
 DEBUGFLAGS = 
-CPPFLAGS = $(DEBUGFLAGS) @CPPFLAGS@
+CPPFLAGS = $(DEBUGFLAGS) -I. -I$(SRCDIR) @CPPFLAGS@
 CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@
 MISCLIBS = @LIBS@

diff --git a/src/compatibility.h b/src/compatibility.h
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <ctype.h>
-#include "enc/enc_base.h"
+#include "enc_base.h"
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>

diff --git a/src/enc/enc_base.h → src/enc_base.h b/src/enc/enc_base.h → src/enc_base.h
diff --git a/src/enc/enc_strings.c → src/enc_strings.c b/src/enc/enc_strings.c → src/enc_strings.c
@@ -27,9 +27,9 @@
 #include <errno.h>
 #endif
 
-#include "../flrn.h"
-#include "../compatibility.h"
-#include "../flrn_slang.h"  /* pour set_Display_Eight_Bit */
+#include "flrn.h"
+#include "compatibility.h"
+#include "flrn_slang.h"  /* pour set_Display_Eight_Bit */
 #include "enc_strings.h"
 
 static UNUSED char rcsid[]="$Id$";
@@ -40,21 +40,21 @@ static UNUSED char rcsid[]="$Id$";
 
 /* includes pour chrtrans */
 #define CONST const
-#include "../chrtrans/UCkd.h"
+#include "chrtrans/UCkd.h"
 /* Pages incluses : cf init_charsets */
-#include "../chrtrans/iso01_uni.h"          /* ISO 8859-1 Latin-1   */
-#include "../chrtrans/iso02_uni.h"
-#include "../chrtrans/iso03_uni.h"
-#include "../chrtrans/iso04_uni.h"
-#include "../chrtrans/iso05_uni.h"          /* ISO 8859-5 Cyrillic  */
-#include "../chrtrans/iso06_uni.h"
-#include "../chrtrans/iso07_uni.h"
-#include "../chrtrans/iso08_uni.h"
-#include "../chrtrans/iso09_uni.h"
-#include "../chrtrans/iso10_uni.h"
-#include "../chrtrans/iso15_uni.h"
-#include "../chrtrans/def7_uni.h"           /* 7 bit approximations */
-#include "../chrtrans/utf8_uni.h"           /* utf-8 unicode */
+#include "chrtrans/iso01_uni.h"          /* ISO 8859-1 Latin-1   */
+#include "chrtrans/iso02_uni.h"
+#include "chrtrans/iso03_uni.h"
+#include "chrtrans/iso04_uni.h"
+#include "chrtrans/iso05_uni.h"          /* ISO 8859-5 Cyrillic  */
+#include "chrtrans/iso06_uni.h"
+#include "chrtrans/iso07_uni.h"
+#include "chrtrans/iso08_uni.h"
+#include "chrtrans/iso09_uni.h"
+#include "chrtrans/iso10_uni.h"
+#include "chrtrans/iso15_uni.h"
+#include "chrtrans/def7_uni.h"           /* 7 bit approximations */
+#include "chrtrans/utf8_uni.h"           /* utf-8 unicode */
 
 #define MAXCHARSETS 20               /* max character sets supported */
 

diff --git a/src/enc/enc_strings.h → src/enc_strings.h b/src/enc/enc_strings.h → src/enc_strings.h
@@ -15,7 +15,7 @@
 
 #include <wchar.h>
 
-#include "../flrn.h"
+#include "flrn.h"
 
 /* gestion des charsets */
 extern int read_terminal_charset ();

diff --git a/src/flrn.h b/src/flrn.h
@@ -16,7 +16,7 @@
 #include "config.h"	    /* Defines de configure */
 #include "flrn_config.h"    /* Defines autres */
 #include "compatibility.h"  /* La compatibilité */
-#include "enc/enc_base.h"   /* fonctions chaînes de base */
+#include "enc_base.h"   /* fonctions chaînes de base */
 #include "flrn_glob.h"      /* Variables externes */
 
 #ifdef HAVE_GETTEXT

diff --git a/src/flrn_color.c b/src/flrn_color.c
@@ -22,7 +22,7 @@
 #include "flrn_slang.h"
 #include "options.h"
 #include "flrn_color.h"
-#include "enc/enc_strings.h"
+#include "enc_strings.h"
 
 static char UNUSED rcsid[]="$Id$";
 

diff --git a/src/flrn_command.c b/src/flrn_command.c
@@ -31,7 +31,7 @@
 #include "tty_keyboard.h"
 #include "flrn_pager.h"
 #include "flrn_menus.h"
-#include "enc/enc_strings.h"
+#include "enc_strings.h"
 #include "flrn_format.h"
 #ifdef USE_SLANG_LANGUAGE
 #include "slang_flrn.h"

diff --git a/src/flrn_comp.c b/src/flrn_comp.c
@@ -15,7 +15,7 @@
 #include "flrn_slang.h"
 #include "flrn_comp.h"
 #include "tty_keyboard.h"
-#include "enc/enc_strings.h"
+#include "enc_strings.h"
 
 static UNUSED char rcsid[]="$Id$";
 

diff --git a/src/flrn_comp.h b/src/flrn_comp.h
@@ -14,7 +14,7 @@
 #define FLRN_COMP_H
 
 #include "tty_keyboard.h"
-#include "enc/enc_base.h"
+#include "enc_base.h"
 
 typedef struct liste_de_chaine {
   flrn_char *une_chaine;

diff --git a/src/flrn_config.h b/src/flrn_config.h
@@ -15,7 +15,7 @@
 
 #include "pathdef.h"
 #include "config.h"
-#include "enc/enc_base.h"
+#include "enc_base.h"
 
 /* L'utilisateur peut modifier la valeurs qui suivent jusqu'au
    "-- ne rien modifier ensuite --" */

diff --git a/src/flrn_files.c b/src/flrn_files.c
@@ -28,7 +28,7 @@
 #include "flrn_files.h"
 #include "flrn_filter.h"
 #include "rfc2047.h"
-#include "enc/enc_strings.h"
+#include "enc_strings.h"
 
 static UNUSED char rcsid[]="$Id$";
 

diff --git a/src/flrn_filter.c b/src/flrn_filter.c
@@ -23,7 +23,7 @@
 #include "flrn_files.h"
 #include "flrn_xover.h"
 #include "flrn_inter.h"
-#include "enc/enc_strings.h"
+#include "enc_strings.h"
 
 #include "getdate.h"
 

diff --git a/src/flrn_format.c b/src/flrn_format.c
@@ -29,7 +29,7 @@
 #ifdef USE_SLANG_LANGUAGE
 #include <slang.h>
 #endif
-#include "enc/enc_strings.h"
+#include "enc_strings.h"
 
 static UNUSED char rcsid[]="$Id$";
 

diff --git a/src/flrn_format.h b/src/flrn_format.h
@@ -16,7 +16,7 @@
 /* Les fonctions */
 
 #include <stdio.h>
-#include "enc/enc_base.h"
+#include "enc_base.h"
 #include "art_group.h"
 
 extern time_t parse_date(flrn_char * /*s*/);

diff --git a/src/flrn_func.c b/src/flrn_func.c
@@ -32,7 +32,7 @@
 #include "flrn_tags.h"
 #include "flrn_regexp.h"
 #include "flrn_func.h"
-#include "enc/enc_strings.h"
+#include "enc_strings.h"
 
 static UNUSED char rcsid[]="$Id$";
 

diff --git a/src/flrn_glob.h b/src/flrn_glob.h
@@ -16,7 +16,7 @@
 #include <pwd.h>
 
 #include "flrn_config.h"
-#include "enc/enc_base.h"
+#include "enc_base.h"
 
 #ifdef CHECK_MAIL
 extern char *mailbox;

diff --git a/src/flrn_help.c b/src/flrn_help.c
@@ -20,7 +20,7 @@
 #include "tty_display.h"
 #include "tty_keyboard.h"
 #include "flrn_help.h"
-#include "enc/enc_strings.h"
+#include "enc_strings.h"
 
 static UNUSED char rcsid[]="$Id$";
 

diff --git a/src/flrn_inter.c b/src/flrn_inter.c
@@ -41,7 +41,7 @@
 #include "flrn_messages.h"
 #include "flrn_xover.h"
 #include "flrn_func.h"
-#include "enc/enc_strings.h"
+#include "enc_strings.h"
 #ifdef USE_SLANG_LANGUAGE
 #include "slang.h"
 #include "slang_flrn.h"

diff --git a/src/flrn_lists.c b/src/flrn_lists.c
@@ -17,7 +17,7 @@
 #include "flrn.h"
 #include "flrn_config.h"
 #include "flrn_lists.h"
-#include "enc/enc_strings.h"
+#include "enc_strings.h"
 
 static UNUSED char rcsid[]="$Id$";
 

diff --git a/src/flrn_lists.h b/src/flrn_lists.h
@@ -14,7 +14,7 @@
 #define FLRN_FLRN_LISTE_H
 
 #include "flrn_config.h"
-#include "enc/enc_base.h"
+#include "enc_base.h"
 typedef struct _Flrn_liste_els {
   struct _Flrn_liste_els *next;
   flrn_char *ptr;

diff --git a/src/flrn_macros.h b/src/flrn_macros.h
@@ -14,7 +14,7 @@
 #define FLRN_MACROS_H
 
 #include "config.h"
-#include "enc/enc_base.h"
+#include "enc_base.h"
 
 /* on partage les macros entre tous les contextes */
 #define MAX_FL_MACRO 256

diff --git a/src/flrn_menus.c b/src/flrn_menus.c
@@ -23,7 +23,7 @@
 #include "flrn_slang.h"
 #include "flrn_messages.h"
 #include "flrn_format.h"
-#include "enc/enc_strings.h"
+#include "enc_strings.h"
 
 static UNUSED char rcsid[]="$Id$";
 

diff --git a/src/flrn_menus.h b/src/flrn_menus.h
@@ -13,7 +13,7 @@
 #ifndef FLRN_MENUS_H
 #define FLRN_MENUS_H
 
-#include "enc/enc_base.h"
+#include "enc_base.h"
 #include "flrn_slang.h"
 #include "tty_keyboard.h"
 

diff --git a/src/flrn_pager.c b/src/flrn_pager.c
@@ -24,7 +24,7 @@
 #include "tty_keyboard.h"
 #include "flrn_slang.h"
 #include "flrn_messages.h"
-#include "enc/enc_strings.h"
+#include "enc_strings.h"
 
 static UNUSED char rcsid[]="$Id$";
 

diff --git a/src/flrn_regexp.c b/src/flrn_regexp.c
@@ -23,7 +23,7 @@
 
 #include "flrn.h"
 #include "flrn_regexp.h"
-#include "enc/enc_base.h"
+#include "enc_base.h"
 
 static UNUSED char rcsid[]="$Id$";
 

diff --git a/src/flrn_regexp.h b/src/flrn_regexp.h
@@ -13,7 +13,7 @@
 #ifndef FLRN_FLRN_REGEXP_H
 #define FLRN_FLRN_REGEXP_H
 
-#include "enc/enc_base.h"
+#include "enc_base.h"
 
 /* les fonctions */
 

diff --git a/src/flrn_shell.c b/src/flrn_shell.c
@@ -32,7 +32,7 @@
 #include "flrn_shell.h"
 #include "tty_display.h"
 #include "tty_keyboard.h"
-#include "enc/enc_strings.h"
+#include "enc_strings.h"
 
 static UNUSED char rcsid[]="$Id$";
 

diff --git a/src/flrn_slang.c b/src/flrn_slang.c
@@ -20,7 +20,7 @@
 #include "flrn.h"
 #include "flrn_slang.h"
 #include "flrn_color.h"
-#include "enc/enc_strings.h"
+#include "enc_strings.h"
 #ifdef HAVE_WCHAR_H
 #include <wchar.h>
 #endif

diff --git a/src/flrn_slang.h b/src/flrn_slang.h
@@ -62,7 +62,7 @@ extern File_Line_Type *Text_scroll;
 /* Les fonctions */
 
 #include "flrn_glob.h"
-#include "enc/enc_base.h"
+#include "enc_base.h"
 
 extern void Screen_suspend(void);
 extern void Screen_resume(void);