From bc3d40635c0dc7c1e3589e54145a0beab9dee64c Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Fri, 29 Aug 2008 22:51:56 +0000 Subject: [PATCH] Some installer cleanup. * In contrib/bsdinstaller-1.1.6, fix include names, e.g. "aura/..." -> "libaura/..." * In usr.sbin/installer: - Include "../../Makefile.inc" to not have to define variables such as BINDIR ourselves - Use NOMAN - Remove -g - No longer install header files from libinstaller/ and add them to 'make upgrade' --- Makefile_upgrade.inc | 9 ++++- .../src/backend/installer/flow.c | 28 ++++++++-------- .../src/backend/installer/fn.h | 6 ++-- .../src/backend/installer/fn_configure.c | 26 +++++++-------- .../src/backend/installer/fn_diagnostic.c | 18 +++++----- .../src/backend/installer/fn_disk.c | 16 ++++----- .../src/backend/installer/fn_install.c | 24 +++++++------- .../src/backend/installer/fn_subpart.c | 26 +++++++-------- .../src/backend/installer/main.c | 8 ++--- .../src/frontends/ncurses/curses_bar.c | 2 +- .../src/frontends/ncurses/curses_form.c | 4 +-- .../src/frontends/ncurses/curses_widget.c | 2 +- .../src/frontends/ncurses/curses_xlat.c | 6 ++-- .../src/frontends/ncurses/main.c | 10 +++--- .../src/lib/libdfui/conn_caps.c | 4 +-- .../src/lib/libdfui/conn_npipe.c | 4 +-- .../src/lib/libdfui/conn_tcp.c | 2 +- .../src/lib/libdfui/connection.c | 4 +-- .../src/lib/libdfui/decode.c | 4 +-- .../bsdinstaller-1.1.6/src/lib/libdfui/dfui.h | 2 +- .../src/lib/libdfui/encode.c | 2 +- .../src/lib/libdfui/encoding.h | 2 +- .../bsdinstaller-1.1.6/src/lib/libdfui/form.c | 2 +- .../src/lib/libinstaller/commands.c | 8 ++--- .../src/lib/libinstaller/commands.h | 2 +- .../src/lib/libinstaller/confed.c | 6 ++-- .../src/lib/libinstaller/confed.h | 2 +- .../src/lib/libinstaller/diskutil.c | 10 +++--- .../src/lib/libinstaller/functions.c | 6 ++-- .../src/lib/libinstaller/functions.h | 4 +-- .../src/lib/libinstaller/mount.c | 2 +- .../src/lib/libinstaller/package.c | 8 ++--- .../src/lib/libinstaller/survey.c | 2 +- .../src/lib/libinstaller/uiutil.c | 2 +- usr.sbin/installer/dfuibe_installer/Makefile | 29 ++++------------ usr.sbin/installer/dfuife_curses/Makefile | 33 ++++--------------- usr.sbin/installer/libaura/Makefile | 9 +++-- usr.sbin/installer/libdfui/Makefile | 19 ++++------- usr.sbin/installer/libinstaller/Makefile | 25 ++++---------- 39 files changed, 164 insertions(+), 214 deletions(-) diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index c77e61adad..88af5f1d22 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -1,4 +1,4 @@ -# $DragonFly: src/Makefile_upgrade.inc,v 1.30 2008/07/14 23:59:34 swildner Exp $ +# $DragonFly: src/Makefile_upgrade.inc,v 1.31 2008/08/29 22:51:55 swildner Exp $ # # Append all obsolete files to this file # Avoid constructs like {foo,bar}. It is parsed by /bin/sh @@ -946,3 +946,10 @@ TO_REMOVE+=/usr/share/man/cat3/readline.3.gz TO_REMOVE+=/usr/share/man/man3/readline.3.gz TO_REMOVE+=/usr/share/man/cat5/types.5.gz TO_REMOVE+=/usr/share/man/man5/types.5.gz +TO_REMOVE+=/usr/include/commands.h +TO_REMOVE+=/usr/include/confed.h +TO_REMOVE+=/usr/include/diskutil.h +TO_REMOVE+=/usr/include/functions.h +TO_REMOVE+=/usr/include/package.h +TO_REMOVE+=/usr/include/sysids.h +TO_REMOVE+=/usr/include/uiutil.h diff --git a/contrib/bsdinstaller-1.1.6/src/backend/installer/flow.c b/contrib/bsdinstaller-1.1.6/src/backend/installer/flow.c index e00db9444e..a74ff90fda 100644 --- a/contrib/bsdinstaller-1.1.6/src/backend/installer/flow.c +++ b/contrib/bsdinstaller-1.1.6/src/backend/installer/flow.c @@ -45,29 +45,29 @@ #ifdef ENABLE_NLS #include #include -#include "dfui/lang.h" +#include "libdfui/lang.h" #define _(String) gettext (String) extern int _nl_msg_cat_cntr; #else #define _(String) (String) #endif -#include "aura/mem.h" -#include "aura/dict.h" -#include "aura/fspred.h" +#include "libaura/mem.h" +#include "libaura/dict.h" +#include "libaura/fspred.h" -#include "dfui/dfui.h" +#include "libdfui/dfui.h" #ifdef DEBUG -#include "dfui/dump.h" +#include "libdfui/dump.h" #endif -#include "dfui/system.h" - -#include "installer/commands.h" -#include "installer/confed.h" -#include "installer/diskutil.h" -#include "installer/functions.h" -#include "installer/package.h" -#include "installer/uiutil.h" +#include "libdfui/system.h" + +#include "libinstaller/commands.h" +#include "libinstaller/confed.h" +#include "libinstaller/diskutil.h" +#include "libinstaller/functions.h" +#include "libinstaller/package.h" +#include "libinstaller/uiutil.h" #include "flow.h" #include "fn.h" diff --git a/contrib/bsdinstaller-1.1.6/src/backend/installer/fn.h b/contrib/bsdinstaller-1.1.6/src/backend/installer/fn.h index eb64230e1c..0f1444c148 100644 --- a/contrib/bsdinstaller-1.1.6/src/backend/installer/fn.h +++ b/contrib/bsdinstaller-1.1.6/src/backend/installer/fn.h @@ -39,10 +39,10 @@ #ifndef __FN_H_ #define __FN_H_ -#include "aura/dict.h" -#include "dfui/dfui.h" +#include "libaura/dict.h" +#include "libdfui/dfui.h" -#include "installer/functions.h" +#include "libinstaller/functions.h" /*** PROTOTYPES ***/ diff --git a/contrib/bsdinstaller-1.1.6/src/backend/installer/fn_configure.c b/contrib/bsdinstaller-1.1.6/src/backend/installer/fn_configure.c index 10206d3afd..94ff32e4a1 100644 --- a/contrib/bsdinstaller-1.1.6/src/backend/installer/fn_configure.c +++ b/contrib/bsdinstaller-1.1.6/src/backend/installer/fn_configure.c @@ -57,19 +57,19 @@ #define _(String) (String) #endif -#include "aura/mem.h" -#include "aura/dict.h" -#include "aura/fspred.h" - -#include "dfui/dfui.h" -#include "dfui/system.h" - -#include "installer/commands.h" -#include "installer/confed.h" -#include "installer/diskutil.h" -#include "installer/functions.h" -#include "installer/package.h" -#include "installer/uiutil.h" +#include "libaura/mem.h" +#include "libaura/dict.h" +#include "libaura/fspred.h" + +#include "libdfui/dfui.h" +#include "libdfui/system.h" + +#include "libinstaller/commands.h" +#include "libinstaller/confed.h" +#include "libinstaller/diskutil.h" +#include "libinstaller/functions.h" +#include "libinstaller/package.h" +#include "libinstaller/uiutil.h" #include "fn.h" #include "pathnames.h" diff --git a/contrib/bsdinstaller-1.1.6/src/backend/installer/fn_diagnostic.c b/contrib/bsdinstaller-1.1.6/src/backend/installer/fn_diagnostic.c index 8821d9d558..492b94f960 100644 --- a/contrib/bsdinstaller-1.1.6/src/backend/installer/fn_diagnostic.c +++ b/contrib/bsdinstaller-1.1.6/src/backend/installer/fn_diagnostic.c @@ -52,17 +52,17 @@ #define _(String) (String) #endif -#include "aura/mem.h" -#include "aura/buffer.h" +#include "libaura/mem.h" +#include "libaura/buffer.h" -#include "dfui/dfui.h" +#include "libdfui/dfui.h" -#include "installer/commands.h" -#include "installer/confed.h" -#include "installer/diskutil.h" -#include "installer/functions.h" -#include "installer/package.h" -#include "installer/uiutil.h" +#include "libinstaller/commands.h" +#include "libinstaller/confed.h" +#include "libinstaller/diskutil.h" +#include "libinstaller/functions.h" +#include "libinstaller/package.h" +#include "libinstaller/uiutil.h" #include "fn.h" #include "pathnames.h" diff --git a/contrib/bsdinstaller-1.1.6/src/backend/installer/fn_disk.c b/contrib/bsdinstaller-1.1.6/src/backend/installer/fn_disk.c index 51d005dc6d..49d4221dd6 100644 --- a/contrib/bsdinstaller-1.1.6/src/backend/installer/fn_disk.c +++ b/contrib/bsdinstaller-1.1.6/src/backend/installer/fn_disk.c @@ -47,16 +47,16 @@ #define _(String) (String) #endif -#include "aura/mem.h" -#include "aura/fspred.h" +#include "libaura/mem.h" +#include "libaura/fspred.h" -#include "dfui/dfui.h" -#include "dfui/system.h" +#include "libdfui/dfui.h" +#include "libdfui/system.h" -#include "installer/commands.h" -#include "installer/diskutil.h" -#include "installer/functions.h" -#include "installer/uiutil.h" +#include "libinstaller/commands.h" +#include "libinstaller/diskutil.h" +#include "libinstaller/functions.h" +#include "libinstaller/uiutil.h" #include "fn.h" #include "pathnames.h" diff --git a/contrib/bsdinstaller-1.1.6/src/backend/installer/fn_install.c b/contrib/bsdinstaller-1.1.6/src/backend/installer/fn_install.c index 463c46f0cf..d6949eae3b 100644 --- a/contrib/bsdinstaller-1.1.6/src/backend/installer/fn_install.c +++ b/contrib/bsdinstaller-1.1.6/src/backend/installer/fn_install.c @@ -49,18 +49,18 @@ #define _(String) (String) #endif -#include "aura/mem.h" -#include "aura/buffer.h" -#include "aura/fspred.h" - -#include "dfui/dfui.h" -#include "dfui/system.h" - -#include "installer/commands.h" -#include "installer/confed.h" -#include "installer/diskutil.h" -#include "installer/functions.h" -#include "installer/uiutil.h" +#include "libaura/mem.h" +#include "libaura/buffer.h" +#include "libaura/fspred.h" + +#include "libdfui/dfui.h" +#include "libdfui/system.h" + +#include "libinstaller/commands.h" +#include "libinstaller/confed.h" +#include "libinstaller/diskutil.h" +#include "libinstaller/functions.h" +#include "libinstaller/uiutil.h" #include "flow.h" #include "pathnames.h" diff --git a/contrib/bsdinstaller-1.1.6/src/backend/installer/fn_subpart.c b/contrib/bsdinstaller-1.1.6/src/backend/installer/fn_subpart.c index 3dc46a37ff..4785bfe2cf 100644 --- a/contrib/bsdinstaller-1.1.6/src/backend/installer/fn_subpart.c +++ b/contrib/bsdinstaller-1.1.6/src/backend/installer/fn_subpart.c @@ -48,19 +48,19 @@ #define _(String) (String) #endif -#include "aura/mem.h" -#include "aura/buffer.h" -#include "aura/dict.h" -#include "aura/fspred.h" - -#include "dfui/dfui.h" -#include "dfui/dump.h" -#include "dfui/system.h" - -#include "installer/commands.h" -#include "installer/diskutil.h" -#include "installer/functions.h" -#include "installer/uiutil.h" +#include "libaura/mem.h" +#include "libaura/buffer.h" +#include "libaura/dict.h" +#include "libaura/fspred.h" + +#include "libdfui/dfui.h" +#include "libdfui/dump.h" +#include "libdfui/system.h" + +#include "libinstaller/commands.h" +#include "libinstaller/diskutil.h" +#include "libinstaller/functions.h" +#include "libinstaller/uiutil.h" #include "fn.h" #include "flow.h" diff --git a/contrib/bsdinstaller-1.1.6/src/backend/installer/main.c b/contrib/bsdinstaller-1.1.6/src/backend/installer/main.c index 71ffb6abdc..5379087589 100644 --- a/contrib/bsdinstaller-1.1.6/src/backend/installer/main.c +++ b/contrib/bsdinstaller-1.1.6/src/backend/installer/main.c @@ -50,11 +50,11 @@ #define _(String) (String) #endif -#include "aura/mem.h" +#include "libaura/mem.h" -#include "dfui/dfui.h" -#include "dfui/dump.h" -#include "dfui/system.h" +#include "libdfui/dfui.h" +#include "libdfui/dump.h" +#include "libdfui/system.h" #include "flow.h" #include "pathnames.h" diff --git a/contrib/bsdinstaller-1.1.6/src/frontends/ncurses/curses_bar.c b/contrib/bsdinstaller-1.1.6/src/frontends/ncurses/curses_bar.c index 785ff89016..bd782d0b4a 100644 --- a/contrib/bsdinstaller-1.1.6/src/frontends/ncurses/curses_bar.c +++ b/contrib/bsdinstaller-1.1.6/src/frontends/ncurses/curses_bar.c @@ -41,7 +41,7 @@ #include #include -#include "aura/mem.h" +#include "libaura/mem.h" #include "curses_util.h" #include "curses_bar.h" diff --git a/contrib/bsdinstaller-1.1.6/src/frontends/ncurses/curses_form.c b/contrib/bsdinstaller-1.1.6/src/frontends/ncurses/curses_form.c index 512dc4611b..4c5152e8ac 100644 --- a/contrib/bsdinstaller-1.1.6/src/frontends/ncurses/curses_form.c +++ b/contrib/bsdinstaller-1.1.6/src/frontends/ncurses/curses_form.c @@ -49,9 +49,9 @@ #define _(String) (String) #endif -#include "aura/mem.h" +#include "libaura/mem.h" -#include "dfui/dump.h" +#include "libdfui/dump.h" #include "curses_form.h" #include "curses_widget.h" diff --git a/contrib/bsdinstaller-1.1.6/src/frontends/ncurses/curses_widget.c b/contrib/bsdinstaller-1.1.6/src/frontends/ncurses/curses_widget.c index 3fe25e9631..4449d3f791 100644 --- a/contrib/bsdinstaller-1.1.6/src/frontends/ncurses/curses_widget.c +++ b/contrib/bsdinstaller-1.1.6/src/frontends/ncurses/curses_widget.c @@ -41,7 +41,7 @@ #include #include -#include "aura/mem.h" +#include "libaura/mem.h" #include "curses_form.h" #include "curses_widget.h" diff --git a/contrib/bsdinstaller-1.1.6/src/frontends/ncurses/curses_xlat.c b/contrib/bsdinstaller-1.1.6/src/frontends/ncurses/curses_xlat.c index 81b4cef6d3..565f47a9d7 100644 --- a/contrib/bsdinstaller-1.1.6/src/frontends/ncurses/curses_xlat.c +++ b/contrib/bsdinstaller-1.1.6/src/frontends/ncurses/curses_xlat.c @@ -43,10 +43,10 @@ #include #include -#include "aura/mem.h" +#include "libaura/mem.h" -#include "dfui/dfui.h" -#include "dfui/dump.h" +#include "libdfui/dfui.h" +#include "libdfui/dump.h" #include "curses_form.h" #include "curses_widget.h" diff --git a/contrib/bsdinstaller-1.1.6/src/frontends/ncurses/main.c b/contrib/bsdinstaller-1.1.6/src/frontends/ncurses/main.c index 78b413b58a..d7bab55747 100644 --- a/contrib/bsdinstaller-1.1.6/src/frontends/ncurses/main.c +++ b/contrib/bsdinstaller-1.1.6/src/frontends/ncurses/main.c @@ -47,20 +47,20 @@ #ifdef ENABLE_NLS #include -#include "dfui/lang.h" +#include "libdfui/lang.h" #define _(String) gettext (String) extern int _nl_msg_cat_cntr; #else #define _(String) (String) #endif -#include "aura/mem.h" +#include "libaura/mem.h" -#include "dfui/dfui.h" +#include "libdfui/dfui.h" #ifdef DEBUG -#include "dfui/dump.h" +#include "libdfui/dump.h" #endif -#include "dfui/system.h" +#include "libdfui/system.h" #include "curses_form.h" #include "curses_widget.h" diff --git a/contrib/bsdinstaller-1.1.6/src/lib/libdfui/conn_caps.c b/contrib/bsdinstaller-1.1.6/src/lib/libdfui/conn_caps.c index 30f6764963..76e0d42133 100644 --- a/contrib/bsdinstaller-1.1.6/src/lib/libdfui/conn_caps.c +++ b/contrib/bsdinstaller-1.1.6/src/lib/libdfui/conn_caps.c @@ -54,8 +54,8 @@ #include #include -#include -#include +#include +#include #define NEEDS_DFUI_STRUCTURE_DEFINITIONS #include "dfui.h" diff --git a/contrib/bsdinstaller-1.1.6/src/lib/libdfui/conn_npipe.c b/contrib/bsdinstaller-1.1.6/src/lib/libdfui/conn_npipe.c index a62fa6984b..7f262306ad 100644 --- a/contrib/bsdinstaller-1.1.6/src/lib/libdfui/conn_npipe.c +++ b/contrib/bsdinstaller-1.1.6/src/lib/libdfui/conn_npipe.c @@ -52,8 +52,8 @@ #include #include -#include -#include +#include +#include #define NEEDS_DFUI_STRUCTURE_DEFINITIONS #include "dfui.h" diff --git a/contrib/bsdinstaller-1.1.6/src/lib/libdfui/conn_tcp.c b/contrib/bsdinstaller-1.1.6/src/lib/libdfui/conn_tcp.c index 960e17b3be..a7fd42cfb9 100644 --- a/contrib/bsdinstaller-1.1.6/src/lib/libdfui/conn_tcp.c +++ b/contrib/bsdinstaller-1.1.6/src/lib/libdfui/conn_tcp.c @@ -72,7 +72,7 @@ #include #include -#include +#include #define NEEDS_DFUI_STRUCTURE_DEFINITIONS #include "dfui.h" diff --git a/contrib/bsdinstaller-1.1.6/src/lib/libdfui/connection.c b/contrib/bsdinstaller-1.1.6/src/lib/libdfui/connection.c index 5e9c2fdf4e..9a1184c385 100644 --- a/contrib/bsdinstaller-1.1.6/src/lib/libdfui/connection.c +++ b/contrib/bsdinstaller-1.1.6/src/lib/libdfui/connection.c @@ -43,8 +43,8 @@ #include #include -#include -#include +#include +#include #include "system.h" #define NEEDS_DFUI_STRUCTURE_DEFINITIONS diff --git a/contrib/bsdinstaller-1.1.6/src/lib/libdfui/decode.c b/contrib/bsdinstaller-1.1.6/src/lib/libdfui/decode.c index 84727ee6d6..9845ef4180 100644 --- a/contrib/bsdinstaller-1.1.6/src/lib/libdfui/decode.c +++ b/contrib/bsdinstaller-1.1.6/src/lib/libdfui/decode.c @@ -39,8 +39,8 @@ #include #include -#include -#include +#include +#include #define NEEDS_DFUI_STRUCTURE_DEFINITIONS #include "dfui.h" diff --git a/contrib/bsdinstaller-1.1.6/src/lib/libdfui/dfui.h b/contrib/bsdinstaller-1.1.6/src/lib/libdfui/dfui.h index 8e15bbf5ce..021ff808f8 100644 --- a/contrib/bsdinstaller-1.1.6/src/lib/libdfui/dfui.h +++ b/contrib/bsdinstaller-1.1.6/src/lib/libdfui/dfui.h @@ -49,7 +49,7 @@ DFUI_BEGINDECLS -#include +#include /* * TYPEDEFS diff --git a/contrib/bsdinstaller-1.1.6/src/lib/libdfui/encode.c b/contrib/bsdinstaller-1.1.6/src/lib/libdfui/encode.c index 227addb8be..641ac79149 100644 --- a/contrib/bsdinstaller-1.1.6/src/lib/libdfui/encode.c +++ b/contrib/bsdinstaller-1.1.6/src/lib/libdfui/encode.c @@ -40,7 +40,7 @@ #include #include -#include +#include #define NEEDS_DFUI_STRUCTURE_DEFINITIONS #include "dfui.h" diff --git a/contrib/bsdinstaller-1.1.6/src/lib/libdfui/encoding.h b/contrib/bsdinstaller-1.1.6/src/lib/libdfui/encoding.h index 50ed39f7ea..305aed37df 100644 --- a/contrib/bsdinstaller-1.1.6/src/lib/libdfui/encoding.h +++ b/contrib/bsdinstaller-1.1.6/src/lib/libdfui/encoding.h @@ -36,7 +36,7 @@ * $Id: encoding.h,v 1.7 2005/02/07 06:40:00 cpressey Exp $ */ -#include +#include #include "dfui.h" diff --git a/contrib/bsdinstaller-1.1.6/src/lib/libdfui/form.c b/contrib/bsdinstaller-1.1.6/src/lib/libdfui/form.c index 48fae6f3a1..7d68db4a49 100644 --- a/contrib/bsdinstaller-1.1.6/src/lib/libdfui/form.c +++ b/contrib/bsdinstaller-1.1.6/src/lib/libdfui/form.c @@ -40,7 +40,7 @@ #include #include -#include +#include #define NEEDS_DFUI_STRUCTURE_DEFINITIONS #include "dfui.h" diff --git a/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/commands.c b/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/commands.c index 0a9542d3da..eb12177fc7 100644 --- a/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/commands.c +++ b/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/commands.c @@ -48,11 +48,11 @@ #include #include -#include "aura/mem.h" -#include "aura/buffer.h" -#include "aura/popen.h" +#include "libaura/mem.h" +#include "libaura/buffer.h" +#include "libaura/popen.h" -#include "dfui/dfui.h" +#include "libdfui/dfui.h" #define NEEDS_COMMANDS_STRUCTURE_DEFINITIONS #include "commands.h" diff --git a/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/commands.h b/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/commands.h index e040711c9d..403112a37e 100644 --- a/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/commands.h +++ b/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/commands.h @@ -38,7 +38,7 @@ #include -#include "dfui/dfui.h" +#include "libdfui/dfui.h" #ifndef __COMMANDS_H_ #define __COMMANDS_H_ diff --git a/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/confed.c b/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/confed.c index d4adaaa084..0e4aefb113 100644 --- a/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/confed.c +++ b/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/confed.c @@ -48,9 +48,9 @@ #include #include -#include "aura/mem.h" -#include "aura/dict.h" -#include "dfui/system.h" +#include "libaura/mem.h" +#include "libaura/dict.h" +#include "libdfui/system.h" #include "confed.h" #include "commands.h" diff --git a/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/confed.h b/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/confed.h index b9398ca336..5c236c5584 100644 --- a/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/confed.h +++ b/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/confed.h @@ -39,7 +39,7 @@ #ifndef __CONFED_H_ #define __CONFED_H_ -#include "aura/dict.h" +#include "libaura/dict.h" struct i_fn_args; diff --git a/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/diskutil.c b/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/diskutil.c index 4b350ec419..01b64e982e 100644 --- a/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/diskutil.c +++ b/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/diskutil.c @@ -42,12 +42,12 @@ #include #include -#include "aura/mem.h" -#include "aura/fspred.h" -#include "aura/popen.h" +#include "libaura/mem.h" +#include "libaura/fspred.h" +#include "libaura/popen.h" -#include "dfui/dfui.h" -#include "dfui/dump.h" +#include "libdfui/dfui.h" +#include "libdfui/dump.h" #define NEEDS_DISKUTIL_STRUCTURE_DEFINITIONS #include "diskutil.h" diff --git a/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/functions.c b/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/functions.c index cda0ff91ae..c40713d374 100644 --- a/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/functions.c +++ b/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/functions.c @@ -44,10 +44,10 @@ #include #include -#include "aura/mem.h" -#include "aura/dict.h" +#include "libaura/mem.h" +#include "libaura/dict.h" -#include "dfui/dfui.h" +#include "libdfui/dfui.h" #include "functions.h" #include "diskutil.h" diff --git a/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/functions.h b/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/functions.h index db1f317a93..a537cef575 100644 --- a/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/functions.h +++ b/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/functions.h @@ -41,8 +41,8 @@ #include -#include "aura/dict.h" -#include "dfui/dfui.h" +#include "libaura/dict.h" +#include "libdfui/dfui.h" #include "confed.h" diff --git a/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/mount.c b/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/mount.c index 9d2d212cb2..cb12753ceb 100644 --- a/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/mount.c +++ b/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/mount.c @@ -47,7 +47,7 @@ #include #include -#include "aura/fspred.h" +#include "libaura/fspred.h" #include "commands.h" #include "functions.h" diff --git a/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/package.c b/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/package.c index f623372dbd..6c00b39ba3 100644 --- a/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/package.c +++ b/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/package.c @@ -43,11 +43,11 @@ #include #include -#include "aura/dict.h" -#include "aura/fspred.h" -#include "aura/popen.h" +#include "libaura/dict.h" +#include "libaura/fspred.h" +#include "libaura/popen.h" -#include "dfui/dfui.h" +#include "libdfui/dfui.h" #include "commands.h" #include "diskutil.h" diff --git a/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/survey.c b/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/survey.c index 77da750784..417310e4cd 100644 --- a/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/survey.c +++ b/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/survey.c @@ -46,7 +46,7 @@ #include #include -#include "aura/dict.h" +#include "libaura/dict.h" #include "commands.h" #include "diskutil.h" diff --git a/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/uiutil.c b/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/uiutil.c index f5629d3d71..73686a28a6 100644 --- a/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/uiutil.c +++ b/contrib/bsdinstaller-1.1.6/src/lib/libinstaller/uiutil.c @@ -41,7 +41,7 @@ #include #include -#include "dfui/dfui.h" +#include "libdfui/dfui.h" #include "functions.h" #include "uiutil.h" diff --git a/usr.sbin/installer/dfuibe_installer/Makefile b/usr.sbin/installer/dfuibe_installer/Makefile index b935e9e48b..73a35c8317 100644 --- a/usr.sbin/installer/dfuibe_installer/Makefile +++ b/usr.sbin/installer/dfuibe_installer/Makefile @@ -1,5 +1,5 @@ # -# $DragonFly: src/usr.sbin/installer/dfuibe_installer/Makefile,v 1.4 2008/08/29 20:41:01 swildner Exp $ +# $DragonFly: src/usr.sbin/installer/dfuibe_installer/Makefile,v 1.5 2008/08/29 22:51:56 swildner Exp $ BSDINS_DIR=${.CURDIR}/../../../contrib/bsdinstaller-1.1.6 BSDINS_SRC=${BSDINS_DIR}/src @@ -7,32 +7,14 @@ BSDINS_SRC=${BSDINS_DIR}/src CONTRIBDIR=${BSDINS_SRC}/backend/installer .PATH: ${CONTRIBDIR} -BINDIR= /usr/sbin PROG= dfuibe_installer -MAN= +NOMAN= SRCS= flow.c fn_diagnostic.c fn_install.c fn_zonetab.c \ - fn_configure.c fn_disk.c fn_subpart.c main.c \ - aura.h dfui.h installer.h -BINOWN= root -BINGRP= wheel + fn_configure.c fn_disk.c fn_subpart.c main.c -CFLAGS+= -I${CONTRIBDIR} -I. -g +CFLAGS+= -I${BSDINS_SRC}/lib -# This madness is because the installer sources reference aura includes -# as rather than -aura.h: - ${LN} -sf ${BSDINS_SRC}/lib/libaura aura - /usr/bin/touch aura.h - -dfui.h: - ${LN} -sf ${BSDINS_SRC}/lib/libdfui dfui - /usr/bin/touch dfui.h - -installer.h: - ${LN} -sf ${BSDINS_SRC}/lib/libinstaller installer - /usr/bin/touch installer.h - -CLEANFILES+= aura.h aura dfui.h dfui installer.h installer +CLEANFILES+= aura dfui installer .if exists(${.OBJDIR}/../libaura) LIBAURADIR:= ${.OBJDIR}/../libaura @@ -58,4 +40,5 @@ LIBINSTALLER:= ${LIBINSTALLERDIR}/libinstaller.a DPADD+= ${LIBAURA} ${LIBDFUI} ${LIBINSTALLER} LDADD+= -L${LIBAURADIR} -L${LIBDFUIDIR} -L${LIBINSTALLERDIR} -linstaller -ldfui -laura +.include "../../Makefile.inc" .include diff --git a/usr.sbin/installer/dfuife_curses/Makefile b/usr.sbin/installer/dfuife_curses/Makefile index 7ef1c459bf..bc1843a413 100644 --- a/usr.sbin/installer/dfuife_curses/Makefile +++ b/usr.sbin/installer/dfuife_curses/Makefile @@ -1,42 +1,22 @@ # -# $DragonFly: src/usr.sbin/installer/dfuife_curses/Makefile,v 1.2 2008/03/25 22:55:38 dave Exp $ +# $DragonFly: src/usr.sbin/installer/dfuife_curses/Makefile,v 1.3 2008/08/29 22:51:56 swildner Exp $ BSDINS_DIR=${.CURDIR}/../../../contrib/bsdinstaller-1.1.6 BSDINS_SRC=${BSDINS_DIR}/src -PATCHES= - .PATH: ${BSDINS_SRC}/frontends/ncurses -BINDIR= /usr/sbin - PROG= dfuife_curses -MAN= -SRCS= curses_bar.c curses_form.c curses_util.c curses_widget.c curses_xlat.c main.c \ - aura.h dfui.h installer.h ${PATCHES} -BINOWN= root -BINGRP= wheel +NOMAN= +SRCS= curses_bar.c curses_form.c curses_util.c curses_widget.c \ + curses_xlat.c main.c -CFLAGS+= -I${BSDINS_SRC}/frontends/ncurses -I. -g +CFLAGS+= -I${BSDINS_SRC}/lib DPADD+= ${LIBPANEL} ${LIBNCURSES} LDADD+= -lpanel -lncurses -# This madness is because the installer sources reference aura includes -# as rather than -aura.h: - ${LN} -sf ${BSDINS_SRC}/lib/libaura aura - /usr/bin/touch aura.h - -dfui.h: - ${LN} -sf ${BSDINS_SRC}/lib/libdfui dfui - /usr/bin/touch dfui.h - -installer.h: - ${LN} -sf ${BSDINS_SRC}/lib/libinstaller installer - /usr/bin/touch installer.h - -CLEANFILES+= aura.h aura dfui.h dfui installer.h installer +CLEANFILES+= aura dfui installer .if exists(${.OBJDIR}/../libaura) LIBAURADIR:= ${.OBJDIR}/../libaura @@ -62,4 +42,5 @@ LIBINSTALLER:= ${LIBINSTALLERDIR}/libinstaller.a DPADD+= ${LIBAURA} ${LIBDFUI} ${LIBINSTALLER} LDADD+= -L${LIBAURADIR} -L${LIBDFUIDIR} -L${LIBINSTALLERDIR} -linstaller -ldfui -laura +.include "../../Makefile.inc" .include diff --git a/usr.sbin/installer/libaura/Makefile b/usr.sbin/installer/libaura/Makefile index 71e182f486..f5c9ce9991 100644 --- a/usr.sbin/installer/libaura/Makefile +++ b/usr.sbin/installer/libaura/Makefile @@ -1,17 +1,16 @@ -# $DragonFly: src/usr.sbin/installer/libaura/Makefile,v 1.2 2008/03/25 22:55:38 dave Exp $ +# $DragonFly: src/usr.sbin/installer/libaura/Makefile,v 1.3 2008/08/29 22:51:56 swildner Exp $ BSDINS_DIR=${.CURDIR}/../../../contrib/bsdinstaller-1.1.6 BSDINS_SRC=${BSDINS_DIR}/src CONTRIBDIR= ${BSDINS_SRC}/lib/libaura .PATH: ${CONTRIBDIR} -CFLAGS+=-I${CONTRIBDIR} -g +CFLAGS+=-I${CONTRIBDIR} LIB= aura -SRCS+= buffer.c dict.c fspred.c mem.c popen.c +SRCS= buffer.c dict.c fspred.c mem.c popen.c -INTERNALLIB= true +INTERNALLIB= true .include - diff --git a/usr.sbin/installer/libdfui/Makefile b/usr.sbin/installer/libdfui/Makefile index e70376fec8..9e77daadf3 100644 --- a/usr.sbin/installer/libdfui/Makefile +++ b/usr.sbin/installer/libdfui/Makefile @@ -1,4 +1,4 @@ -# $DragonFly: src/usr.sbin/installer/libdfui/Makefile,v 1.2 2008/03/25 22:55:38 dave Exp $ +# $DragonFly: src/usr.sbin/installer/libdfui/Makefile,v 1.3 2008/08/29 22:51:56 swildner Exp $ BSDINS_DIR=${.CURDIR}/../../../contrib/bsdinstaller-1.1.6 BSDINS_SRC=${BSDINS_DIR}/src @@ -6,21 +6,14 @@ BSDINS_SRC=${BSDINS_DIR}/src CONTRIBDIR=${BSDINS_SRC}/lib/libdfui .PATH: ${CONTRIBDIR} -CFLAGS+=-I${CONTRIBDIR} -I. -g +CFLAGS+=-I${BSDINS_SRC}/lib LIB= dfui -SRCS+= conn_caps.c conn_npipe.c conn_tcp.c connection.c decode.c \ - dump.c encode.c form.c lang.c system.c aura.h +SRCS= conn_caps.c conn_npipe.c conn_tcp.c connection.c decode.c \ + dump.c encode.c form.c lang.c system.c -# This madness is because the installer sources reference aura includes -# as rather than -aura.h: - ${LN} -sf ${BSDINS_SRC}/lib/libaura aura - /usr/bin/touch aura.h - -CLEANFILES+= aura.h aura -INTERNALLIB= true +CLEANFILES+= aura +INTERNALLIB= true .include - diff --git a/usr.sbin/installer/libinstaller/Makefile b/usr.sbin/installer/libinstaller/Makefile index 1f7e993c87..5ca6c22e6e 100644 --- a/usr.sbin/installer/libinstaller/Makefile +++ b/usr.sbin/installer/libinstaller/Makefile @@ -1,4 +1,4 @@ -# $DragonFly: src/usr.sbin/installer/libinstaller/Makefile,v 1.4 2008/08/29 20:41:01 swildner Exp $ +# $DragonFly: src/usr.sbin/installer/libinstaller/Makefile,v 1.5 2008/08/29 22:51:56 swildner Exp $ BSDINS_DIR=${.CURDIR}/../../../contrib/bsdinstaller-1.1.6 BSDINS_SRC=${BSDINS_DIR}/src @@ -6,30 +6,17 @@ BSDINS_SRC=${BSDINS_DIR}/src CONTRIBDIR= ${BSDINS_SRC}/lib/libinstaller .PATH: ${CONTRIBDIR} -CFLAGS+= -I${BSDINS_SRC}/lib/libdfui -I${CONTRIBDIR} -I. -g +CFLAGS+= -I${BSDINS_SRC}/lib LIB= installer -SRCS+= commands.c confed.c diskutil.c functions.c mount.c package.c survey.c uiutil.c -SRCS+= aura.h dfui.h +SRCS= commands.c confed.c diskutil.c functions.c mount.c package.c survey.c \ + uiutil.c -INCS+= commands.h confed.h diskutil.h functions.h package.h sysids.h uiutil.h - -# This madness is because the installer sources reference aura includes -# as rather than -aura.h: - ${LN} -sf ${BSDINS_SRC}/lib/libaura aura - /usr/bin/touch aura.h - -dfui.h: - ${LN} -sf ${BSDINS_SRC}/lib/libdfui dfui - /usr/bin/touch dfui.h - -CLEANFILES+= aura.h dfui.h aura dfui -INTERNALLIB= true +CLEANFILES+= aura dfui +INTERNALLIB= true DPADD+= ${.CURDIR}/../libaura/libaura.a ${.CURDIR}/../libdfui/libdfui.a LDADD+= -laura -ldfui .include - -- 2.41.0