Put libveriuser into a single .o file.
This commit is contained in:
parent
a89f39f166
commit
ddba06904c
|
|
@ -16,7 +16,7 @@
|
||||||
# 59 Temple Place - Suite 330
|
# 59 Temple Place - Suite 330
|
||||||
# Boston, MA 02111-1307, USA
|
# Boston, MA 02111-1307, USA
|
||||||
#
|
#
|
||||||
#ident "$Id: Makefile.in,v 1.5 2003/10/02 21:30:40 steve Exp $"
|
#ident "$Id: Makefile.in,v 1.6 2003/10/06 21:27:05 steve Exp $"
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
SHELL = /bin/sh
|
SHELL = /bin/sh
|
||||||
|
|
@ -62,13 +62,13 @@ dep:
|
||||||
|
|
||||||
O = cadpli.o
|
O = cadpli.o
|
||||||
|
|
||||||
SYSTEM_VPI_LDFLAGS = @whole_archive@ ../libveriuser/libveriuser.a @no_whole_archive@ -L../vvp -lvpi
|
SYSTEM_VPI_LDFLAGS = -L../vvp -lvpi
|
||||||
ifeq (@WIN32@,yes)
|
ifeq (@WIN32@,yes)
|
||||||
SYSTEM_VPI_LDFLAGS += -liberty
|
SYSTEM_VPI_LDFLAGS += -liberty
|
||||||
endif
|
endif
|
||||||
|
|
||||||
cadpli.vpl: $O ../vvp/libvpi.a ../libveriuser/libveriuser.a
|
cadpli.vpl: $O ../vvp/libvpi.a ../libveriuser/libveriuser.o
|
||||||
$(CC) @shared@ -o $@ $O $(SYSTEM_VPI_LDFLAGS)
|
$(CC) @shared@ -o $@ $O ../libveriuser/libveriuser.o $(SYSTEM_VPI_LDFLAGS)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -rf *.o dep cadpli.vpl
|
rm -rf *.o dep cadpli.vpl
|
||||||
|
|
|
||||||
|
|
@ -64,19 +64,12 @@ AC_MSG_RESULT($PICFLAG)
|
||||||
AC_MSG_CHECKING("for -rdynamic compiler flag")
|
AC_MSG_CHECKING("for -rdynamic compiler flag")
|
||||||
|
|
||||||
rdynamic=-rdynamic
|
rdynamic=-rdynamic
|
||||||
whole_archive=-Wl,-whole-archive
|
|
||||||
no_whole_archive=-Wl,-no-whole-archive
|
|
||||||
case "${host}" in
|
case "${host}" in
|
||||||
|
|
||||||
*-*-netbsd*)
|
*-*-netbsd*)
|
||||||
rdynamic="-Wl,--export-dynamic"
|
rdynamic="-Wl,--export-dynamic"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
*-*-openbsd*)
|
|
||||||
whole_archive=""
|
|
||||||
no_whole_archive=""
|
|
||||||
;;
|
|
||||||
|
|
||||||
*-*-solaris*)
|
*-*-solaris*)
|
||||||
rdynamic=""
|
rdynamic=""
|
||||||
;;
|
;;
|
||||||
|
|
@ -91,19 +84,12 @@ case "${host}" in
|
||||||
|
|
||||||
*-*-darwin*)
|
*-*-darwin*)
|
||||||
rdynamic="-Wl,-all_load"
|
rdynamic="-Wl,-all_load"
|
||||||
whole_archive=""
|
|
||||||
no_whole_archive=""
|
|
||||||
;;
|
;;
|
||||||
|
|
||||||
esac
|
esac
|
||||||
AC_SUBST(rdynamic)
|
AC_SUBST(rdynamic)
|
||||||
AC_SUBST(whole_archive)
|
|
||||||
AC_SUBST(no_whole_archive)
|
|
||||||
AC_MSG_RESULT($rdynamic)
|
AC_MSG_RESULT($rdynamic)
|
||||||
|
|
||||||
AC_MSG_CHECKING("for -whole-archive compiler flags")
|
|
||||||
AC_MSG_RESULT($whole_archive $no_whole_archive)
|
|
||||||
|
|
||||||
AC_MSG_CHECKING("for shared library link flag")
|
AC_MSG_CHECKING("for shared library link flag")
|
||||||
shared=-shared
|
shared=-shared
|
||||||
case "${host}" in
|
case "${host}" in
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@
|
||||||
# 59 Temple Place - Suite 330
|
# 59 Temple Place - Suite 330
|
||||||
# Boston, MA 02111-1307, USA
|
# Boston, MA 02111-1307, USA
|
||||||
#
|
#
|
||||||
#ident "$Id: Makefile.in,v 1.28 2003/10/02 19:33:44 steve Exp $"
|
#ident "$Id: Makefile.in,v 1.29 2003/10/06 21:27:05 steve Exp $"
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
SHELL = /bin/sh
|
SHELL = /bin/sh
|
||||||
|
|
@ -65,9 +65,12 @@ check: all
|
||||||
Makefile: Makefile.in config.status
|
Makefile: Makefile.in config.status
|
||||||
./config.status
|
./config.status
|
||||||
|
|
||||||
libveriuser.a: $O
|
libveriuser.o: $O
|
||||||
|
$(LD) -r -o $@ $O
|
||||||
|
|
||||||
|
libveriuser.a: libveriuser.o
|
||||||
rm -f $@
|
rm -f $@
|
||||||
ar cvq $@ $O
|
ar cvq $@ libveriuser.o
|
||||||
$(RANLIB) $@
|
$(RANLIB) $@
|
||||||
|
|
||||||
dep:
|
dep:
|
||||||
|
|
@ -79,7 +82,7 @@ dep:
|
||||||
|
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -rf *.o dep libveriuser.a
|
rm -rf *.o dep libveriuser.a libveriuser.o
|
||||||
|
|
||||||
distclean: clean
|
distclean: clean
|
||||||
rm -f Makefile config.status config.log config.cache
|
rm -f Makefile config.status config.log config.cache
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ case "${host}" in
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
AC_MSG_CHECKING("for flag to make position independent code")
|
AC_MSG_CHECKING(for flag to make position independent code)
|
||||||
PICFLAG=-fPIC
|
PICFLAG=-fPIC
|
||||||
case "${host}" in
|
case "${host}" in
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue