CVS: beepcore-c/utility/unix Makefile.in,1.4,1.5

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/utility/unix
In directory usw-pr-cvs1:/tmp/cvs-serv32661/utility/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/utility/unix/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.in	28 Mar 2002 23:03:10 -0000	1.4
--- Makefile.in	2 Aug 2002 04:18:30 -0000	1.5
***************
*** 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
  
- include $(SRC_ROOT)/Make.defs
- #
- #
- #
  incfile= Makefile
  
--- 12,22 ----
  # License.
  #
! # $Id$
  
! ### Generic settings
! srcdir = @srcdir@
! top_srcdir = @top_srcdir@
! include $(top_srcdir)/Make.defs
  
  incfile= Makefile
  
***************
*** 44,88 ****
  	bp_slist_utility.lo
  
! all: libbputil.la libbeepxmlutil.la libxmlglobal.la hashtest unit_xml_entities unit_clist
  
  clean:
  	touch foo.o foo.so ; \
! 	rm -rf *.o *.so *.la *.lo *.a .libs ;\
  	rm -f  configtest hashtest unit_xml_entities unit_clist
  
  hashtest: $(OBJS) hashtest.lo hashtest.lo $(XMLOBJS) $(XMLGLOBOBJS) $(MEMOBJS) 
! 	$(LDLIBTOOL) $(CC) $(prelib) -o $@ hashtest.lo $(OBJS) $(SYSLIBS) $(XMLOBJS) $(XMLGLOBOBJS)
  
  unit_xml_entities: unit_xml_entities.lo $(XMLOBJS) $(XMLGLOBOBJS) $(MEMOBJS) 
! 	$(LDLIBTOOL) $(CC) $(CCFLAGS) -o $@ unit_xml_entities.lo $(XMLOBJS) $(XMLGLOBOBJS) $(MEMOBJS) 
  
  unit_clist: unit_clist.lo $(MEMOBJS) 
! 	$(LDLIBTOOL) $(CC) $(CCFLAGS) -o $@ unit_clist.lo bp_clist.lo $(MEMOBJS) 
  
  libbputil.la: $(OBJS)
! 	$(LDLIBTOOL) $(CC) -o $@ $(OBJS) $(LIBTOOL_LDFLAGS) $(SYSLIBS)
  
  libxmlglobal.la: $(XMLGLOBOBJS)
! 	$(LDLIBTOOL) $(CC) -o $@ $(XMLGLOBOBJS) $(LIBTOOL_LDFLAGS)
  
  libbeepxmlutil.la: $(XMLOBJS)
! 	$(LDLIBTOOL) $(CC) -o $@ $(XMLOBJS) $(LIBTOOL_LDFLAGS)
! 
! install: $(LIB_INSTALL_DIR)
! 	 $(INSTALLLIB) libbeepxmlutil.la $(LIB_INSTALL_DIR)/.
! 	 $(INSTALLLIB) libbputil.la      $(LIB_INSTALL_DIR)/.
! 	 $(INSTALLLIB) libxmlglobal.la   $(LIB_INSTALL_DIR)/.
! 	 $(INSTALLFINISH) $(LIB_INSTALL_DIR)/.
  
! $(LIB_INSTALL_DIR):
! 	$(INSTALLDIR) $@
  
  .DEFAULT:
  
! ################################################################################
! #
! # Include the default behavior at the eend so as not to 
! # replace the default target above if any.
! #
! include $(SRC_ROOT)/Make.targets
! 
--- 33,69 ----
  	bp_slist_utility.lo
  
! all: libbputil.la libbeepxmlutil.la libxmlglobal.la \
! 		hashtest unit_xml_entities unit_clist
  
  clean:
  	touch foo.o foo.so ; \
! 	rm -rf *.o *.so *.la *.lo *.a .libs ; \
  	rm -f  configtest hashtest unit_xml_entities unit_clist
  
  hashtest: $(OBJS) hashtest.lo hashtest.lo $(XMLOBJS) $(XMLGLOBOBJS) $(MEMOBJS) 
! 	$(LDLIBTOOL) $(CC) $(prelib) -o $@ hashtest.lo $(OBJS) $(SYSLIBS) \
! 		$(XMLOBJS) $(XMLGLOBOBJS)
  
  unit_xml_entities: unit_xml_entities.lo $(XMLOBJS) $(XMLGLOBOBJS) $(MEMOBJS) 
! 	$(LDLIBTOOL) $(CC) $(CCFLAGS) -o $@ unit_xml_entities.lo $(XMLOBJS) \
! 		$(XMLGLOBOBJS) $(MEMOBJS)
  
  unit_clist: unit_clist.lo $(MEMOBJS) 
! 	$(LDLIBTOOL) $(CC) $(CCFLAGS) -o $@ unit_clist.lo bp_clist.lo \
! 		$(MEMOBJS)
  
  libbputil.la: $(OBJS)
! 	$(LDLIBTOOL) $(CC) -o $@ $(OBJS) $(SYSLIBS)
  
  libxmlglobal.la: $(XMLGLOBOBJS)
! 	$(LDLIBTOOL) $(CC) -o $@ $(XMLGLOBOBJS)
  
  libbeepxmlutil.la: $(XMLOBJS)
! 	$(LDLIBTOOL) $(CC) -o $@ $(XMLOBJS)
  
! install:
  
  .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