[xplc-cvs] xplc/config config.mk.in,1.38,1.39 rules.mk,1.46,1.47

[Simon L. <sf...@us...>]

Update of /cvsroot/xplc/xplc/config
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4380/config

Modified Files:
	config.mk.in rules.mk 
Log Message:
Add a UUID generation program that also spits out XPLC C definitions.
This is supposed to be quite portable, so I've only used what POSIX gives us.

http://bugs.debian.org/310755


Index: rules.mk
===================================================================
RCS file: /cvsroot/xplc/xplc/config/rules.mk,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** rules.mk	21 Oct 2005 13:03:02 -0000	1.46
--- rules.mk	21 Oct 2005 13:18:22 -0000	1.47
***************
*** 22,25 ****
--- 22,29 ----
  .PHONY: ChangeLog dist dustclean clean distclean realclean installdirs install uninstall doxygen clean-doxygen examples
  
+ %.o: %.c
+ 	@$(COMPILE.c) -M -E $< | sed -e 's|^.*:|$@:|' > $(dir $@).$(notdir $(@:.o=.d))
+ 	$(COMPILE.c) $(OUTPUT_OPTION) $<
+ 
  %.o: %.cpp
  	@$(COMPILE.cpp) -M -E $< | sed -e 's|^.*:|$@:|' > $(dir $@).$(notdir $(@:.o=.d))
***************
*** 101,104 ****
--- 105,109 ----
  
  installdirs:
+ 	mkdir -p $(DESTDIR)$(bindir)
  	mkdir -p $(DESTDIR)$(libdir)/pkgconfig
  	mkdir -p $(DESTDIR)$(libdir)$(xplcdir_version)
***************
*** 107,110 ****
--- 112,118 ----
  install: default installdirs
  	$(INSTALL_PROGRAM) libxplc.so $(DESTDIR)$(libdir)/libxplc.so.$(PACKAGE_VERSION)
+ 	$(INSTALL_DATA) libxplc.a $(DESTDIR)$(libdir)$(libdir_version)
+ 	$(INSTALL_DATA) libxplc-cxx.a $(DESTDIR)$(libdir)$(libdir_version)
+ 	$(INSTALL_PROGRAM) uuid/bin/uuidgen $(DESTDIR)$(bindir)
  	$(INSTALL_DATA) libxplc.a $(DESTDIR)$(libdir)$(xplcdir_version)
  	$(INSTALL_DATA) libxplc-cxx.a $(DESTDIR)$(libdir)$(xplcdir_version)
***************
*** 113,116 ****
--- 121,125 ----
  	$(LN_S) $(lib_prefix_version)libxplc.so.$(PACKAGE_VERSION) $(DESTDIR)$(libdir)$(xplcdir_version)/libxplc.so
  	$(LN_S) libxplc.a $(DESTDIR)$(libdir)$(xplcdir_version)/libxplc_s.a
+ 	$(LN_S) uuidgen $(DESTDIR)$(bindir)/uuidcdef
  
  uninstall:
***************
*** 119,122 ****
--- 128,132 ----
  	rm -f $(DESTDIR)$(libdir)$(xplcdir_version)/libxplc-cxx.a
  	rm -f $(DESTDIR)$(libdir)/pkgconfig/xplc$(pc_version).pc
+ 	rm -f $(DESTDIR)$(bindir)/uuidgen $(DESTDIR)$(bindir)/uuidcdef
  	rm -rf $(DESTDIR)$(includedir)$(xplcdir_version)/xplc
  ifneq ($(xplcdir_version),)

Index: config.mk.in
===================================================================
RCS file: /cvsroot/xplc/xplc/config/config.mk.in,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** config.mk.in	21 Oct 2005 13:03:02 -0000	1.38
--- config.mk.in	21 Oct 2005 13:18:22 -0000	1.39
***************
*** 23,26 ****
--- 23,28 ----
  
  # set variables from the configure script
+ CC=@CC@
+ CFLAGS+=@CFLAGS@
  CXX=@CXX@
  CXXFLAGS+=@CXXFLAGS@
***************
*** 31,38 ****
--- 33,43 ----
  with_dlopen:=@with_dlopen@
  so_style:=@so_style@
+ with_uuid:=@with_uuid@
+ with_uuid_static:=@with_uuid_static@
  prefix:=@prefix@
  exec_prefix:=@exec_prefix@
  includedir:=@includedir@
  libdir:=@libdir@
+ bindir:=@bindir@
  INSTALL:=@INSTALL@
  INSTALL_PROGRAM:=@INSTALL_PROGRAM@