CVS: beepcore-c/profiles/unix Makefile.in,1.9,1.10

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/profiles/unix
In directory usw-pr-cvs1:/tmp/cvs-serv32661/profiles/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/profiles/unix/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Makefile.in	4 Jan 2002 07:07:03 -0000	1.9
--- Makefile.in	2 Aug 2002 04:18:30 -0000	1.10
***************
*** 12,34 ****
  # 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=	$(SSL_INCLUDES) $(CYRUS_INCLUDES)
  
! include $(SRC_ROOT)/Make.defs
! #
! #
  
  VPATH = .:..:../SASLutils:../../wrapper:../../utility:../../core/generic:../../transport:
--- 12,22 ----
  # License.
  #
! # $Id$
  
! ### Generic settings
! srcdir = @srcdir@
! top_srcdir = @top_srcdir@
! MF_CFLAGS = $(SSL_INCLUDES) $(CYRUS_INCLUDES)
! include $(top_srcdir)/Make.defs
  
  VPATH = .:..:../SASLutils:../../wrapper:../../utility:../../core/generic:../../transport:
***************
*** 51,65 ****
  	rm -rf *.o *.so *.la *.lo .libs
  
! install: $(LIB_INSTALL_DIR)
! 	$(INSTALLLIB) libnull-profiles.la $(LIB_INSTALL_DIR)/.
! 	$(INSTALLLIB) libsyslog-raw.la    $(LIB_INSTALL_DIR)/.
! 	$(CYRUS_NONE) $(CYRUS_SLIB)       $(LIB_INSTALL_DIR)/.
! 	$(INSTALLLIB) libtls-profile.la   $(LIB_INSTALL_DIR)/.
! 	$(INSTALLLIB) libsasl-profiles.la $(LIB_INSTALL_DIR)/.
! 	$(INSTALLFINISH) $(LIB_INSTALL_DIR)/.
! 
! $(LIB_INSTALL_DIR):
! 	$(INSTALLDIR) $@
! 
  
  shared-libs: 	libnull-profiles.la \
--- 39,48 ----
  	rm -rf *.o *.so *.la *.lo .libs
  
! install: shared-libs
! 	$(INSTALL_DIR) $(DESTDIR)$(libdir)
! 	$(CYRUS_NONE) $(INSTALL_LIB) $(CYRUS_SLIB) $(DESTDIR)$(libdir)/.
! 	$(INSTALL_LIB) libtls-profile.la $(DESTDIR)$(libdir)/.
! 	$(INSTALL_LIB) libsasl-profiles.la $(DESTDIR)$(libdir)/.
! 	$(INSTALL_FINISH) $(DESTDIR)$(libdir)/.
  
  shared-libs: 	libnull-profiles.la \
***************
*** 85,97 ****
  
  blw_malloc_test: blw_malloc_test.lo $(OBJS)
! 	$(CCLIBTOOL) $(CC) blw_malloc_test.o $(OBJS) $(SYSLIBS) $(BEEPLIBS) -o blw_malloc_test
! 
  
  .DEFAULT:
  
! ###############################################################################
! #
! # Include the default behavior at the eend so as not to 
! # replace the default target above if any.
! #
! include $(SRC_ROOT)/Make.targets
--- 68,76 ----
  
  blw_malloc_test: blw_malloc_test.lo $(OBJS)
! 	$(CCLIBTOOL) $(CC) blw_malloc_test.o $(OBJS) $(SYSLIBS) $(BEEPLIBS) \
! 	    -o blw_malloc_test
  
  .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