CVS: beepcore-c Make.defs.in,1.8,1.9 Make.targets,1.3,1.4 Makefile.in,1.3,1.4 configure,1.9,1.10 configure.in,1.10,1.11
Chris Hanson <[email protected]> Thu, 01 Aug 2002 21:18:31 -0700
| Newsgroups | gmane.network.beep.beepcore.c.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/beepcore-c/beepcore-c
In directory usw-pr-cvs1:/tmp/cvs-serv32661
Modified Files:
Make.defs.in Make.targets Makefile.in configure configure.in
Log Message:
Rewrite makefiles to use standard GNU directory variables and to
install in standard places.
Refer to DESTDIR during installation to simplify packaging.
Coalesce all non-profile libraries into a single library.
Don't compile the examples.
Index: Make.defs.in
===================================================================
RCS file: /cvsroot/beepcore-c/beepcore-c/Make.defs.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Make.defs.in 2 Aug 2002 02:42:48 -0000 1.8
--- Make.defs.in 2 Aug 2002 04:18:29 -0000 1.9
***************
*** 45,57 ****
# WARNING! NOT ALL MAKEFILES LOOK AT THE CFLAGS FROM HERE
! ifndef LIBTOOL
! export LIBTOOL = $(top_srcdir)/libtool --quiet
! endif
! ifndef CCLIBTOOL
! export CCLIBTOOL = $(LIBTOOL) --mode=compile
! endif
! ifndef LDLIBTOOL
! export LDLIBTOOL = $(LIBTOOL) --mode=link
! endif
TARGET_LIBS= @TARGET_LIBS@
--- 45,51 ----
# WARNING! NOT ALL MAKEFILES LOOK AT THE CFLAGS FROM HERE
! export LIBTOOL ?= $(shell pwd)/$(top_srcdir)/libtool --quiet
! export CCLIBTOOL ?= $(LIBTOOL) --mode=compile
! export LDLIBTOOL ?= $(LIBTOOL) --mode=link
TARGET_LIBS= @TARGET_LIBS@
***************
*** 74,87 ****
SYSLIBS= $(TARGET_LIBS)
! genutil_dir= $(SRC_ROOT)/utility/unix
! lib_genutil= $(genutil_dir)/libbputil.la \
! $(genutil_dir)/libbeepxmlutil.la \
! $(genutil_dir)/libxmlglobal.la
! lib_beepcore= $(SRC_ROOT)/core/unix/libbeepcore.la
! lib_tosutil= $(SRC_ROOT)/threaded_os/utility/unix/libbptosutil.la
! lib_tostrans= $(SRC_ROOT)/threaded_os/transport/unix/libbptostransport.la
! lib_toswrap= $(SRC_ROOT)/threaded_os/wrapper/unix/libbptoswrapper.la
!
! BEEPLIBS= $(lib_genutil) $(lib_tosutil) $(lib_tostrans) $(lib_toswrap) $(lib_beepcore)
ALL_DEFINES= $(TARGET_DEFINES)
--- 68,72 ----
SYSLIBS= $(TARGET_LIBS)
! BEEPLIBS = $(top_srcdir)/unix/libbeepcore-c.la
ALL_DEFINES= $(TARGET_DEFINES)
***************
*** 103,107 ****
ifdef DEBUG
- DIST_ROOT = $(SRC_ROOT)/Debug
ifdef PURIFY
CC = purify -best-effort $(_CC)
--- 88,91 ----
***************
*** 109,118 ****
CFLAGS = -g
else
- DIST_ROOT = $(SRC_ROOT)/Release
CC = $(_CC)
endif
PLATFORM = unix
- LIB_INSTALL_DIR= $(DIST_ROOT)/lib
### Default target sequence for make
--- 93,100 ----
***************
*** 125,134 ****
$(CCLIBTOOL) $(CC) $(ALL_DEFINES) $(ALL_CFLAGS) $(ALL_CPPFLAGS) -c $<
! LIBTOOL_LDFLAGS = -rpath $(LIB_INSTALL_DIR) -version-info $(LIB_VERSION)
!
! # These definitions will go away when all the makefiles are updated.
! INSTALLBIN = $(LIBTOOL) --mode=install $(INSTALL_PROGRAM)
! INSTALLDAT = $(INSTALL_DATA)
! INSTALLDIR = $(INSTALL_DIR)
! INSTALLLIB = $(INSTALL_LIB)
! INSTALLFINISH = $(INSTALL_FINISH)
--- 107,109 ----
$(CCLIBTOOL) $(CC) $(ALL_DEFINES) $(ALL_CFLAGS) $(ALL_CPPFLAGS) -c $<
! LIBTOOL_LDFLAGS = -rpath $(libdir) -version-info $(LIB_VERSION)
Index: Make.targets
===================================================================
RCS file: /cvsroot/beepcore-c/beepcore-c/Make.targets,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Make.targets 30 Oct 2001 06:00:36 -0000 1.3
--- Make.targets 2 Aug 2002 04:18:29 -0000 1.4
***************
*** 25,33 ****
@for i in $(DIRS) ; do cd $$i ; $(MAKE) clean ; cd .. ; done
! treeinstall: $(DIST_ROOT)
@for i in $(DIRS) ; do cd $$i ; $(MAKE) install ; cd .. ; done
-
- $(DIST_ROOT):
- mkdir -p $(DIST_ROOT)
endif
--- 25,30 ----
@for i in $(DIRS) ; do cd $$i ; $(MAKE) clean ; cd .. ; done
! treeinstall:
@for i in $(DIRS) ; do cd $$i ; $(MAKE) install ; cd .. ; done
endif
Index: Makefile.in
===================================================================
RCS file: /cvsroot/beepcore-c/beepcore-c/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.in 2 Aug 2002 02:06:06 -0000 1.3
--- Makefile.in 2 Aug 2002 04:18:29 -0000 1.4
***************
*** 18,30 ****
# Please notice that all dependencies are resolved by ordering, so
# that you are not allowed to screw around the order of targets!
- #
- # Exit if SRC_ROOT undefined
- #
-
- REL_TO_ROOT =
-
- ifndef SRC_ROOT
- export SRC_ROOT = $(CURDIR)$(REL_TO_ROOT)
- endif
### Generic settings
--- 18,21 ----
***************
*** 34,38 ****
### Target directories
! DIRS = utility core profiles threaded_os
MOREDIRS =
--- 25,29 ----
### Target directories
! DIRS = utility core profiles threaded_os unix
MOREDIRS =
***************
*** 41,46 ****
install: treeinstall
! $(INSTALL_DIR) $(DIST_ROOT)/bin
! $(INSTALL_SCRIPT) beepcore-c-config $(DIST_ROOT)/bin/.
### Default tree handling targets
--- 32,37 ----
install: treeinstall
! $(INSTALL_DIR) $(DESTDIR)$(bindir)
! $(INSTALL_SCRIPT) beepcore-c-config $(DESTDIR)$(bindir)/.
### Default tree handling targets
Index: configure
===================================================================
RCS file: /cvsroot/beepcore-c/beepcore-c/configure,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** configure 2 Aug 2002 01:55:33 -0000 1.9
--- configure 2 Aug 2002 04:18:29 -0000 1.10
***************
*** 1854,1857 ****
--- 1854,1858 ----
threaded_os/wrapper/unix/Makefile
threaded_os/wrapper/Makefile
+ unix/Makefile
utility/unix/Makefile
utility/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
***************
*** 1980,1983 ****
--- 1981,1985 ----
threaded_os/wrapper/unix/Makefile
threaded_os/wrapper/Makefile
+ unix/Makefile
utility/unix/Makefile
utility/Makefile"}
Index: configure.in
===================================================================
RCS file: /cvsroot/beepcore-c/beepcore-c/configure.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** configure.in 2 Aug 2002 01:56:37 -0000 1.10
--- configure.in 2 Aug 2002 04:18:29 -0000 1.11
***************
*** 200,203 ****
--- 200,204 ----
threaded_os/wrapper/unix/Makefile
threaded_os/wrapper/Makefile
+ unix/Makefile
utility/unix/Makefile
utility/Makefile)
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf