Don't install object files when --disable-lib is selected.
This commit is contained in:
parent
fd314683b9
commit
2a4707abe1
|
@ -117,6 +117,8 @@ EMUOBJS = \
|
||||||
|
|
||||||
LIB_TARGET = @LIB_TARGET@
|
LIB_TARGET = @LIB_TARGET@
|
||||||
|
|
||||||
|
ALT_LINK = @ALT_LINK@
|
||||||
|
|
||||||
all: $(MAIN_TARGET)
|
all: $(MAIN_TARGET)
|
||||||
|
|
||||||
@MAKE_RULES@
|
@MAKE_RULES@
|
||||||
|
@ -130,7 +132,7 @@ emu: wine
|
||||||
lib: $(LIBSUBDIRS) $(LIB_TARGET)
|
lib: $(LIBSUBDIRS) $(LIB_TARGET)
|
||||||
|
|
||||||
wine wine.sym: $(LIBSUBDIRS) $(LIB_TARGET) $(EMUSUBDIRS) dummy
|
wine wine.sym: $(LIBSUBDIRS) $(LIB_TARGET) $(EMUSUBDIRS) dummy
|
||||||
$(CC) -o wine $(EMUOBJS) $(LIB_TARGET) $(LDOPTIONS) $(X_LIBS) $(XPM_LIB) $(XLIB) $(LIBS)
|
$(CC) -o wine $(EMUOBJS) $(LIB_TARGET) $(ALT_LINK) $(LDOPTIONS) $(X_LIBS) $(XPM_LIB) $(XLIB) $(LIBS)
|
||||||
nm -n wine | grep -v _compiled >wine.sym
|
nm -n wine | grep -v _compiled >wine.sym
|
||||||
|
|
||||||
libwine.a: $(LIBOBJS)
|
libwine.a: $(LIBOBJS)
|
||||||
|
@ -151,7 +153,7 @@ uninstall_emu: uninstall_lib
|
||||||
|
|
||||||
install_lib: install_includes
|
install_lib: install_includes
|
||||||
[ -d $(libdir) ] || $(MKDIR) $(libdir)
|
[ -d $(libdir) ] || $(MKDIR) $(libdir)
|
||||||
$(INSTALL_DATA) $(LIB_TARGET) $(libdir)
|
if [ $(LIB_TARGET) ]; then $(INSTALL_DATA) $(LIB_TARGET) $(libdir); fi
|
||||||
$(INSTALL_DATA) wine.sym $(libdir)/wine.sym
|
$(INSTALL_DATA) wine.sym $(libdir)/wine.sym
|
||||||
|
|
||||||
uninstall_lib: uninstall_includes
|
uninstall_lib: uninstall_includes
|
||||||
|
|
|
@ -15,6 +15,7 @@ dnl **** Command-line arguments ****
|
||||||
dnl Default values
|
dnl Default values
|
||||||
MAIN_TARGET=emu
|
MAIN_TARGET=emu
|
||||||
LIB_TARGET=libwine.a
|
LIB_TARGET=libwine.a
|
||||||
|
ALT_LINK=" "
|
||||||
TRACE_MSGS=yes # the TRACE() macro
|
TRACE_MSGS=yes # the TRACE() macro
|
||||||
DEBUG_MSGS=yes # the TRACE(), WARN(), and FIXME() macros.
|
DEBUG_MSGS=yes # the TRACE(), WARN(), and FIXME() macros.
|
||||||
|
|
||||||
|
@ -28,7 +29,7 @@ AC_ARG_ENABLE(dll,
|
||||||
|
|
||||||
AC_ARG_ENABLE(lib,
|
AC_ARG_ENABLE(lib,
|
||||||
[ --disable-lib build the Wine without building libwine.a],
|
[ --disable-lib build the Wine without building libwine.a],
|
||||||
[if test "$enableval" = "no"; then LIB_TARGET="\$(LIBOBJS)"; fi])
|
[if test "$enableval" = "no"; then ALT_LINK="\$(LIBOBJS)"; LIB_TARGET=""; fi])
|
||||||
|
|
||||||
dnl AC_ARG_WITH(ipc,
|
dnl AC_ARG_WITH(ipc,
|
||||||
dnl [ --enable-ipc use inter-process communication for DDE],
|
dnl [ --enable-ipc use inter-process communication for DDE],
|
||||||
|
@ -47,6 +48,7 @@ AC_ARG_WITH(reentrant-x,
|
||||||
|
|
||||||
AC_SUBST(MAIN_TARGET)
|
AC_SUBST(MAIN_TARGET)
|
||||||
AC_SUBST(LIB_TARGET)
|
AC_SUBST(LIB_TARGET)
|
||||||
|
AC_SUBST(ALT_LINK)
|
||||||
AC_SUBST(OPTIONS)
|
AC_SUBST(OPTIONS)
|
||||||
|
|
||||||
if test "$DEBUG_MSGS" = "no"
|
if test "$DEBUG_MSGS" = "no"
|
||||||
|
|
Loading…
Reference in New Issue