Some installer cleanup.
authorSascha Wildner <swildner@dragonflybsd.org>
Fri, 29 Aug 2008 22:51:56 +0000 (22:51 +0000)
committerSascha Wildner <swildner@dragonflybsd.org>
Fri, 29 Aug 2008 22:51:56 +0000 (22:51 +0000)
* 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'

39 files changed:
Makefile_upgrade.inc
contrib/bsdinstaller-1.1.6/src/backend/installer/flow.c
contrib/bsdinstaller-1.1.6/src/backend/installer/fn.h
contrib/bsdinstaller-1.1.6/src/backend/installer/fn_configure.c
contrib/bsdinstaller-1.1.6/src/backend/installer/fn_diagnostic.c
contrib/bsdinstaller-1.1.6/src/backend/installer/fn_disk.c
contrib/bsdinstaller-1.1.6/src/backend/installer/fn_install.c
contrib/bsdinstaller-1.1.6/src/backend/installer/fn_subpart.c
contrib/bsdinstaller-1.1.6/src/backend/installer/main.c
contrib/bsdinstaller-1.1.6/src/frontends/ncurses/curses_bar.c
contrib/bsdinstaller-1.1.6/src/frontends/ncurses/curses_form.c
contrib/bsdinstaller-1.1.6/src/frontends/ncurses/curses_widget.c
contrib/bsdinstaller-1.1.6/src/frontends/ncurses/curses_xlat.c
contrib/bsdinstaller-1.1.6/src/frontends/ncurses/main.c
contrib/bsdinstaller-1.1.6/src/lib/libdfui/conn_caps.c
contrib/bsdinstaller-1.1.6/src/lib/libdfui/conn_npipe.c
contrib/bsdinstaller-1.1.6/src/lib/libdfui/conn_tcp.c
contrib/bsdinstaller-1.1.6/src/lib/libdfui/connection.c
contrib/bsdinstaller-1.1.6/src/lib/libdfui/decode.c
contrib/bsdinstaller-1.1.6/src/lib/libdfui/dfui.h
contrib/bsdinstaller-1.1.6/src/lib/libdfui/encode.c
contrib/bsdinstaller-1.1.6/src/lib/libdfui/encoding.h
contrib/bsdinstaller-1.1.6/src/lib/libdfui/form.c
contrib/bsdinstaller-1.1.6/src/lib/libinstaller/commands.c
contrib/bsdinstaller-1.1.6/src/lib/libinstaller/commands.h
contrib/bsdinstaller-1.1.6/src/lib/libinstaller/confed.c
contrib/bsdinstaller-1.1.6/src/lib/libinstaller/confed.h
contrib/bsdinstaller-1.1.6/src/lib/libinstaller/diskutil.c
contrib/bsdinstaller-1.1.6/src/lib/libinstaller/functions.c
contrib/bsdinstaller-1.1.6/src/lib/libinstaller/functions.h
contrib/bsdinstaller-1.1.6/src/lib/libinstaller/mount.c
contrib/bsdinstaller-1.1.6/src/lib/libinstaller/package.c
contrib/bsdinstaller-1.1.6/src/lib/libinstaller/survey.c
contrib/bsdinstaller-1.1.6/src/lib/libinstaller/uiutil.c
usr.sbin/installer/dfuibe_installer/Makefile
usr.sbin/installer/dfuife_curses/Makefile
usr.sbin/installer/libaura/Makefile
usr.sbin/installer/libdfui/Makefile
usr.sbin/installer/libinstaller/Makefile

index c77e61a..88af5f1 100644 (file)
@@ -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
index e00db94..a74ff90 100644 (file)
 #ifdef ENABLE_NLS
 #include <libintl.h>
 #include <locale.h>
-#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"
index eb64230..0f1444c 100644 (file)
 #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 ***/
 
index 10206d3..94ff32e 100644 (file)
 #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"
index 8821d9d..492b94f 100644 (file)
 #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"
index 51d005d..49d4221 100644 (file)
 #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"
index 463c46f..d6949ea 100644 (file)
 #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"
index 3dc46a3..4785bfe 100644 (file)
 #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"
index 71ffb6a..5379087 100644 (file)
 #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"
index 785ff89..bd782d0 100644 (file)
@@ -41,7 +41,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "aura/mem.h"
+#include "libaura/mem.h"
 
 #include "curses_util.h"
 #include "curses_bar.h"
index 512dc46..4c5152e 100644 (file)
@@ -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"
index 3fe25e9..4449d3f 100644 (file)
@@ -41,7 +41,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "aura/mem.h"
+#include "libaura/mem.h"
 
 #include "curses_form.h"
 #include "curses_widget.h"
index 81b4cef..565f47a 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
-#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"
index 78b413b..d7bab55 100644 (file)
 
 #ifdef ENABLE_NLS
 #include <libintl.h>
-#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"
index 30f6764..76e0d42 100644 (file)
@@ -54,8 +54,8 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <aura/mem.h>
-#include <aura/buffer.h>
+#include <libaura/mem.h>
+#include <libaura/buffer.h>
 
 #define        NEEDS_DFUI_STRUCTURE_DEFINITIONS
 #include "dfui.h"
index a62fa69..7f26230 100644 (file)
@@ -52,8 +52,8 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <aura/buffer.h>
-#include <aura/fspred.h>
+#include <libaura/buffer.h>
+#include <libaura/fspred.h>
 
 #define        NEEDS_DFUI_STRUCTURE_DEFINITIONS
 #include "dfui.h"
index 960e17b..a7fd42c 100644 (file)
@@ -72,7 +72,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <aura/buffer.h>
+#include <libaura/buffer.h>
 
 #define        NEEDS_DFUI_STRUCTURE_DEFINITIONS
 #include "dfui.h"
index 5e9c2fd..9a1184c 100644 (file)
@@ -43,8 +43,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <aura/mem.h>
-#include <aura/buffer.h>
+#include <libaura/mem.h>
+#include <libaura/buffer.h>
 
 #include "system.h"
 #define        NEEDS_DFUI_STRUCTURE_DEFINITIONS
index 84727ee..9845ef4 100644 (file)
@@ -39,8 +39,8 @@
 #include <ctype.h>
 #include <stdlib.h>
 
-#include <aura/mem.h>
-#include <aura/buffer.h>
+#include <libaura/mem.h>
+#include <libaura/buffer.h>
 
 #define        NEEDS_DFUI_STRUCTURE_DEFINITIONS
 #include "dfui.h"
index 8e15bbf..021ff80 100644 (file)
@@ -49,7 +49,7 @@
 
 DFUI_BEGINDECLS
 
-#include <aura/buffer.h>
+#include <libaura/buffer.h>
 
 /*
  * TYPEDEFS
index 227addb..641ac79 100644 (file)
@@ -40,7 +40,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <aura/buffer.h>
+#include <libaura/buffer.h>
 
 #define        NEEDS_DFUI_STRUCTURE_DEFINITIONS
 #include "dfui.h"
index 50ed39f..305aed3 100644 (file)
@@ -36,7 +36,7 @@
  * $Id: encoding.h,v 1.7 2005/02/07 06:40:00 cpressey Exp $
  */
 
-#include <aura/buffer.h>
+#include <libaura/buffer.h>
 
 #include "dfui.h"
 
index 48fae6f..7d68db4 100644 (file)
@@ -40,7 +40,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <aura/mem.h>
+#include <libaura/mem.h>
 
 #define        NEEDS_DFUI_STRUCTURE_DEFINITIONS
 #include "dfui.h"
index 0a9542d..eb12177 100644 (file)
 #include <string.h>
 #include <unistd.h>
 
-#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"
index e040711..403112a 100644 (file)
@@ -38,7 +38,7 @@
 
 #include <stdio.h>
 
-#include "dfui/dfui.h"
+#include "libdfui/dfui.h"
 
 #ifndef __COMMANDS_H_
 #define __COMMANDS_H_
index d4adaaa..0e4aefb 100644 (file)
@@ -48,9 +48,9 @@
 #include <time.h>
 #include <unistd.h>
 
-#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"
index b9398ca..5c236c5 100644 (file)
@@ -39,7 +39,7 @@
 #ifndef __CONFED_H_
 #define __CONFED_H_
 
-#include "aura/dict.h"
+#include "libaura/dict.h"
 
 struct i_fn_args;
 
index 4b350ec..01b64e9 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
-#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"
index cda0ff9..c40713d 100644 (file)
 #include <string.h>
 #include <unistd.h>
 
-#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"
index db1f317..a537cef 100644 (file)
@@ -41,8 +41,8 @@
 
 #include <stdio.h>
 
-#include "aura/dict.h"
-#include "dfui/dfui.h"
+#include "libaura/dict.h"
+#include "libdfui/dfui.h"
 
 #include "confed.h"
 
index 9d2d212..cb12753 100644 (file)
@@ -47,7 +47,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "aura/fspred.h"
+#include "libaura/fspred.h"
 
 #include "commands.h"
 #include "functions.h"
index f623372..6c00b39 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
-#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"
index 77da750..417310e 100644 (file)
@@ -46,7 +46,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "aura/dict.h"
+#include "libaura/dict.h"
 
 #include "commands.h"
 #include "diskutil.h"
index f5629d3..73686a2 100644 (file)
@@ -41,7 +41,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "dfui/dfui.h"
+#include "libdfui/dfui.h"
 
 #include "functions.h"
 #include "uiutil.h"
index b935e9e..73a35c8 100644 (file)
@@ -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 <aura/mem.h> rather than <libaura/mem.h>
-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 <bsd.prog.mk>
index 7ef1c45..bc1843a 100644 (file)
@@ -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 <aura/mem.h> rather than <libaura/mem.h>
-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 <bsd.prog.mk>
index 71e182f..f5c9ce9 100644 (file)
@@ -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 <bsd.lib.mk>
-
index e70376f..9e77daa 100644 (file)
@@ -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 <aura/mem.h> rather than <libaura/mem.h>
-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 <bsd.lib.mk>
-
index 1f7e993..5ca6c22 100644 (file)
@@ -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 <aura/mem.h> rather than <libaura/mem.h>
-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 <bsd.lib.mk>
-