CVS: beepcore-c/core/unix/test Makefile.in,1.2,1.3

Chris Hanson <[email protected]> Thu, 01 Aug 2002 21:18:32 -0700
Newsgroups gmane.network.beep.beepcore.c.cvs
Message-ID <[email protected]>
Update of /cvsroot/beepcore-c/beepcore-c/core/unix/test
In directory usw-pr-cvs1:/tmp/cvs-serv32661/core/unix/test

Modified Files:
	Makefile.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: Makefile.in
===================================================================
RCS file: /cvsroot/beepcore-c/beepcore-c/core/unix/test/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.in	30 Oct 2001 06:00:37 -0000	1.2
--- Makefile.in	2 Aug 2002 04:18:30 -0000	1.3
***************
*** 12,37 ****
  # License.
  #
- #
- #
  # $Id$
- #
- 
- #
- # Exit if SRC_ROOT undefined
- #
- REL_TO_ROOT = /../../..
  
! ifndef SRC_ROOT
!   SRC_ROOT = $(CURDIR)$(REL_TO_ROOT)
!   export SRC_ROOT
! endif
! 
! # 1. Generic settings
  
! include $(SRC_ROOT)/Make.defs
! #
! #
! #
! VPATH  =		../../generic:../../test:..:../../../utility/unix/
  
  #CFLAGS		=	-O -fPIC
--- 12,23 ----
  # License.
  #
  # $Id$
  
! ### Generic settings
! srcdir = @srcdir@
! top_srcdir = @top_srcdir@
! include $(top_srcdir)/Make.defs
  
! VPATH = ../../generic:../../test:..:../../../utility/unix
  
  #CFLAGS		=	-O -fPIC
***************
*** 52,56 ****
  endif
  
! CC		=	$(PURECMD) gcc -pipe -Wall $(INCLUDES)
  
  #CC		=	purify -cache-dir=/iw/puretcl/cache -best-effort gcc -pipe -Wall
--- 38,42 ----
  endif
  
! CC		=	$(PURECMD) $(_CC) -pipe -Wall $(INCLUDES)
  
  #CC		=	purify -cache-dir=/iw/puretcl/cache -best-effort gcc -pipe -Wall
***************
*** 65,71 ****
  #			unit_cbeep_chan0_in \
  
- LDLIBTOOL	=	$(LIBTOOL) --mode=link
- 
- 
  all: $(UNIT_TESTS)
  
--- 51,54 ----
***************
*** 74,78 ****
  
  install:
! 	@echo Nothing to do  for install.
  
  unit_base64: unit_base64.lo ../libbeepcore.la
--- 57,61 ----
  
  install:
! 	@echo Nothing to do for install.
  
  unit_base64: unit_base64.lo ../libbeepcore.la
***************
*** 94,120 ****
  		cbxml_entities.lo $(BEEPUTILLIBS)
  
  
! UNIT_CBEEP_DEPS =   	../libbeepcore.la
! 
! #UNIT_CBEEP_DEPS =   	../libbeepcore.la \
! #			$(BEEPUTILLIBS)
! 
! unit_cbeep_chan0_in: unit_cbeep_chan0_in.lo  $(UNIT_CBEEP_DEPS) unit_notify_stubs.lo 
! 	$(LDLIBTOOL) $(CC) $(CCFLAGS) $(LIBS) -o $@ unit_cbeep_chan0_in.lo $(UNIT_CBEEP_DEPS) unit_notify_stubs.lo 
  
  unit_cbeep_io: unit_cbeep_io.lo $(UNIT_CBEEP_DEPS)
! 	$(LDLIBTOOL) $(CC) $(CCFLAGS) $(LIBS) -o $@ unit_cbeep_io.lo $(UNIT_CBEEP_DEPS) $(BEEPUTILLIBS)
  
  unit_cbeep_query: unit_cbeep_query.lo $(UNIT_CBEEP_DEPS)
! 	$(LDLIBTOOL) $(CC) $(CCFLAGS) $(LIBS) -o $@ unit_cbeep_query.lo $(UNIT_CBEEP_DEPS) $(BEEPUTILLIBS)
  
  unit_cbeep_shortframe: unit_cbeep_shortframe.lo $(UNIT_CBEEP_DEPS)
! 	$(LDLIBTOOL) $(CC) $(CCFLAGS) $(LIBS) -o $@ unit_cbeep_shortframe.lo $(UNIT_CBEEP_DEPS) $(BEEPUTILLIBS)
! 
  
! ################################################################################
! #
! # Include the default behavior at the eend so as not to 
! # replace the default target above if any.
! #
! include $(SRC_ROOT)/Make.targets
--- 77,100 ----
  		cbxml_entities.lo $(BEEPUTILLIBS)
  
+ UNIT_CBEEP_DEPS = ../libbeepcore.la
+ #UNIT_CBEEP_DEPS = ../libbeepcore.la $(BEEPUTILLIBS)
  
! unit_cbeep_chan0_in: unit_cbeep_chan0_in.lo $(UNIT_CBEEP_DEPS) \
! 	    unit_notify_stubs.lo
! 	$(LDLIBTOOL) $(CC) $(CCFLAGS) $(LIBS) -o $@ unit_cbeep_chan0_in.lo \
! 	    $(UNIT_CBEEP_DEPS) unit_notify_stubs.lo
  
  unit_cbeep_io: unit_cbeep_io.lo $(UNIT_CBEEP_DEPS)
! 	$(LDLIBTOOL) $(CC) $(CCFLAGS) $(LIBS) -o $@ unit_cbeep_io.lo \
! 	    $(UNIT_CBEEP_DEPS) $(BEEPUTILLIBS)
  
  unit_cbeep_query: unit_cbeep_query.lo $(UNIT_CBEEP_DEPS)
! 	$(LDLIBTOOL) $(CC) $(CCFLAGS) $(LIBS) -o $@ unit_cbeep_query.lo \
! 	    $(UNIT_CBEEP_DEPS) $(BEEPUTILLIBS)
  
  unit_cbeep_shortframe: unit_cbeep_shortframe.lo $(UNIT_CBEEP_DEPS)
! 	$(LDLIBTOOL) $(CC) $(CCFLAGS) $(LIBS) -o $@ unit_cbeep_shortframe.lo \
! 	    $(UNIT_CBEEP_DEPS) $(BEEPUTILLIBS)
  
! ### Default tree handling targets
! include $(top_srcdir)/Make.targets



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf