PERFORCE change 79521 for review
soc-andrew
soc-andrew at FreeBSD.org
Mon Jul 4 08:50:11 GMT 2005
http://perforce.freebsd.org/chv.cgi?CH=79521
Change 79521 by soc-andrew at soc-andrew_serv on 2005/07/04 08:49:29
Add support to libinstaller to extract a distribution by name.
Also sneak in the removal of unneeded libraries from the frontend.
Affected files ...
.. //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/Makefile.inc1#2 edit
.. //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/installer/Makefile#3 edit
.. //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/installer/dist.c#1 add
.. //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/installer/dist.h#1 add
.. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/backend/Makefile#3 edit
.. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/install_ncurses/Makefile#3 edit
Differences ...
==== //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/Makefile.inc1#2 (text+ko) ====
@@ -1,7 +1,7 @@
BSD_INSTALLER_DIR=${.CURDIR}/../../../contrib/bsdinstaller
LIB_DIR=${BSD_INSTALLER_DIR}/lib
-CFLAGS+=-I${LIB_DIR}
+CFLAGS+=-I${LIB_DIR} -I${.CURDIR}/..
AURA_DIR=${LIB_DIR}/aura
DFUI_DIR=${LIB_DIR}/dfui
==== //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/installer/Makefile#3 (text+ko) ====
@@ -3,7 +3,7 @@
SRCS=commands.c confed.c diskutil.c functions.c \
mount.c package.c survey.c uiutil.c
-SRCS+=extract.c
+SRCS+=dist.c extract.c
SHLIB_MAJOR=5
==== //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/backend/Makefile#3 (text+ko) ====
@@ -9,6 +9,7 @@
LDADD+=${LIB_AURA} ${LIB_DFUI} ${LIB_INSTALLER}
LDADD+=-larchive -lbz2 -lz
+LDADD+=-lutil
.PATH: ${BSD_INSTALLER_DIR}/backend/installer
==== //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/install_ncurses/Makefile#3 (text+ko) ====
@@ -7,9 +7,8 @@
.include "../Makefile.inc1"
-LDADD+=${LIB_AURA} ${LIB_DFUI} ${LIB_INSTALLER} \
- -lpanel -lcurses
-LDADD+=-larchive -lbz2 -lz
+LDADD=${LIB_AURA} ${LIB_DFUI}
+LDADD+=-lpanel -lcurses
.PATH: ${BSD_INSTALLER_DIR}/frontends/ncurses
More information about the p4-projects
mailing list