CVS: beepcore-c/threaded_os/examples/unix Makefile.in,1.15,1.16

Update of /cvsroot/beepcore-c/beepcore-c/threaded_os/examples/unix
In directory usw-pr-cvs1:/tmp/cvs-serv32661/threaded_os/examples/unix

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/threaded_os/examples/unix/Makefile.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Makefile.in	18 Mar 2002 23:48:11 -0000	1.15
--- Makefile.in	2 Aug 2002 04:18:30 -0000	1.16
***************
*** 12,33 ****
  # License.
  #
! #
! # $Header$
! #
! # Exit if SRC_ROOT undefined
! #
! REL_TO_ROOT = /../../..
! 
! ifndef SRC_ROOT
!   SRC_ROOT = $(CURDIR)$(REL_TO_ROOT)
!   export SRC_ROOT
! endif
! 
! # 1. Generic settings
! 
! MF_CFLAGS=	$(CYRUS_DEFINES) $(CYRUS_INCLUDES)
  
! include $(SRC_ROOT)/Make.defs
! #
  
  VPATH = .:..:../../wrapper:../../utility:../../utility/unix:../../core/generic:../core/generic/unix:../../profiles:../../profiles/unix:
--- 12,22 ----
  # License.
  #
! # $Id$
  
! ### Generic settings
! srcdir = @srcdir@
! top_srcdir = @top_srcdir@
! MF_CFLAGS = $(CYRUS_DEFINES) $(CYRUS_INCLUDES)
! include $(top_srcdir)/Make.defs
  
  VPATH = .:..:../../wrapper:../../utility:../../utility/unix:../../core/generic:../core/generic/unix:../../profiles:../../profiles/unix:
***************
*** 39,53 ****
  endif
  
! SASL_OBJS    = $(SRC_ROOT)/profiles/unix/md5.lo \
! 	       $(SRC_ROOT)/profiles/unix/do_hash.lo \
! 	       $(SRC_ROOT)/profiles/unix/sasl_general.lo \
! 	       $(SRC_ROOT)/profiles/unix/otp_db.lo
  BEEPD_LIBS   = 
  BEEPNG_LIBS  = $(SASL_OBJS) \
!                $(SRC_ROOT)/profiles/unix/libnull-profiles.la \
! 	       $(SRC_ROOT)/profiles/unix/libsyslog-raw.la \
! 	       $(SRC_ROOT)/profiles/unix/$(SASLP_SLIB) \
! 	       $(SRC_ROOT)/profiles/unix/libtls-profile.la
! 
  
  LIBFILES = 
--- 28,41 ----
  endif
  
! SASL_OBJS    = $(top_srcdir)/profiles/unix/md5.lo \
! 	       $(top_srcdir)/profiles/unix/do_hash.lo \
! 	       $(top_srcdir)/profiles/unix/sasl_general.lo \
! 	       $(top_srcdir)/profiles/unix/otp_db.lo
  BEEPD_LIBS   = 
  BEEPNG_LIBS  = $(SASL_OBJS) \
!                $(top_srcdir)/profiles/unix/libnull-profiles.la \
! 	       $(top_srcdir)/profiles/unix/libsyslog-raw.la \
! 	       $(top_srcdir)/profiles/unix/$(SASLP_SLIB) \
! 	       $(top_srcdir)/profiles/unix/libtls-profile.la
  
  LIBFILES = 
***************
*** 62,67 ****
  EXES	= beepd beepng
  
- BIN_INSTALL_DIR = ${DIST_ROOT}/examples
- 
  all: $(EXES)
  
--- 50,53 ----
***************
*** 69,83 ****
  	touch foo.o foo.so ; rm -rf *.o *.so $(EXES) *.lo *.la .libs
  
! install: $(BIN_INSTALL_DIR)
! 	$(INSTALLBIN) beepd          $(BIN_INSTALL_DIR)
! 	$(INSTALLBIN) beepng         $(BIN_INSTALL_DIR)
! 	$(INSTALLDAT) ../beepd.cfg   $(BIN_INSTALL_DIR)
! 
! $(BIN_INSTALL_DIR):
! 	$(INSTALLDIR) $@
! 
! #
! #
! #
  
  beepd: beepd.lo $(LIBFILES)
--- 55,59 ----
  	touch foo.o foo.so ; rm -rf *.o *.so $(EXES) *.lo *.la .libs
  
! install:
  
  beepd: beepd.lo $(LIBFILES)
***************
*** 107,115 ****
  .DEFAULT:
  
! ################################################################################
! #
! # Include the default behavior at the eend so as not to 
! # replace the default target above if any.
! #
! include $(SRC_ROOT)/Make.targets
! 
--- 83,86 ----
  .DEFAULT:
  
! ### 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