[naviserver-commits] naviserver/include Makefile.global.in,1.3,1.4 Makefile.module.in,1.3,1.4

[Stephen D. <sd...@us...>]

Update of /cvsroot/naviserver/naviserver/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20919/include

Modified Files:
	Makefile.global.in Makefile.module.in 
Log Message:
Reindent code for consistency prior to making changes.


Index: Makefile.global.in
===================================================================
RCS file: /cvsroot/naviserver/naviserver/include/Makefile.global.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.global.in	16 Feb 2005 16:45:44 -0000	1.3
--- Makefile.global.in	27 Apr 2005 05:01:24 -0000	1.4
***************
*** 34,101 ****
  # Makefile.global.in --
  #
! #	Common and platform-specific make variables to be included
! #	by other makefiles.
  #
  
! NAVISERVER	= @NAVISERVER@
! srcdir		= @SRCDIR@
  
! RM           	= /bin/rm -f
! MKDIR		= /bin/mkdir -p
  
  ifdef NSBUILD
!     INSTALL_SH	= $(srcdir)/install-sh -c
  else
!     INSTALL_SH	= $(INSTBIN)/install-sh -c
  endif
! INSTALL_DATA	= $(INSTALL_SH) -m 644
  
! RANLIB	     	= @TCL_RANLIB@
! LIBEXT		= @TCL_SHLIB_SUFFIX@
! TCL_EXEC_PREFIX	= @TCL_EXEC_PREFIX@
! LIB_RUNTIME_DIR =
! LDLIB		= @LDLIB@
! LDSO		= @LDSO@
! CCRFLAG         = @CCRFLAG@
! LDRFLAG         = @LDRFLAG@
  CCRPATH         += @CCRPATH@
  LDRPATH         += @LDRPATH@
! CC		= $(PURIFY) @TCL_CC@
! CFLAGS_DEBUG	= @TCL_CFLAGS_DEBUG@
! CFLAGS_OPTIMIZE = @TCL_CFLAGS_OPTIMIZE@
! CFLAGS_WARNING	= @TCL_CFLAGS_WARNING@
! CFLAGS_INCLUDE	= -I$(INCDIR) @TCL_INCLUDE_SPEC@
! CFLAGS_EXTRA	= @TCL_SHLIB_CFLAGS@ @TCL_EXTRA_CFLAGS@
! DEFS      	= -DNO_CONST @TCL_DEFS@ @DEFS@
! CFLAGS		+= @CFLAGS_DEFAULT@ $(CFLAGS_WARNING) $(CFLAGS_EXTRA) $(CFLAGS_INCLUDE) @CPPFLAGS@ $(DEFS)
  
  ifndef NSBUILD
!     LDFLAGS	+= -L$(NAVISERVER)/lib
!     LIBS	+= -lnsthread -lnsd
!     INCDIR	= $(NAVISERVER)/include
  else
      LDFLAGS	+= -L../nsthread -L../nsd
!     INCDIR	= ../include
      ifneq (nsthread,$(LIB))
!     	LIBS	+= -lnsthread
!     	ifneq (nsd,$(LIB))
              ifneq (nsthreadtest,$(PGM))
!                 LIBS	+= -lnsd
              endif
!     	endif
      endif
  endif
  
! LIBS		+= @TCL_LIB_SPEC@ @TCL_LIBS@ @LDFLAGS@ @LIBS@
! CCLIBS		= $(LIBS) @TCL_LD_FLAGS@
  
  # Install directories
! INSTBIN		= $(NAVISERVER)/bin
! INSTLIB		= $(NAVISERVER)/lib
! INSTMOD		= $(NAVISERVER)/modules
! INSTTCL		= $(NAVISERVER)/modules/tcl
! INSTSRV		= $(NAVISERVER)/servers/server1
! INSTSRVMOD	= $(INSTSRV)/modules
! INSTSRVPAG	= $(INSTSRV)/pages
  
  # Platform-specific options.
--- 34,101 ----
  # Makefile.global.in --
  #
! #     Common and platform-specific make variables to be included
! #     by other makefiles.
  #
  
! NAVISERVER       = @NAVISERVER@
! srcdir           = @SRCDIR@
  
! RM               = /bin/rm -f
! MKDIR            = /bin/mkdir -p
  
  ifdef NSBUILD
!     INSTALL_SH	 = $(srcdir)/install-sh -c
  else
!     INSTALL_SH	 = $(INSTBIN)/install-sh -c
  endif
! INSTALL_DATA	 = $(INSTALL_SH) -m 644
  
! RANLIB           = @TCL_RANLIB@
! LIBEXT           = @TCL_SHLIB_SUFFIX@
! TCL_EXEC_PREFIX  = @TCL_EXEC_PREFIX@
! LIB_RUNTIME_DIR  =
! LDLIB            = @LDLIB@
! LDSO             = @LDSO@
! CCRFLAG          = @CCRFLAG@
! LDRFLAG          = @LDRFLAG@
  CCRPATH         += @CCRPATH@
  LDRPATH         += @LDRPATH@
! CC               = $(PURIFY) @TCL_CC@
! CFLAGS_DEBUG     = @TCL_CFLAGS_DEBUG@
! CFLAGS_OPTIMIZE  = @TCL_CFLAGS_OPTIMIZE@
! CFLAGS_WARNING   = @TCL_CFLAGS_WARNING@
! CFLAGS_INCLUDE   = -I$(INCDIR) @TCL_INCLUDE_SPEC@
! CFLAGS_EXTRA     = @TCL_SHLIB_CFLAGS@ @TCL_EXTRA_CFLAGS@
! DEFS             = -DNO_CONST @TCL_DEFS@ @DEFS@
! CFLAGS          += @CFLAGS_DEFAULT@ $(CFLAGS_WARNING) $(CFLAGS_EXTRA) $(CFLAGS_INCLUDE) @CPPFLAGS@ $(DEFS)
  
  ifndef NSBUILD
!     LDFLAGS += -L$(NAVISERVER)/lib
!     LIBS    += -lnsthread -lnsd
!     INCDIR   = $(NAVISERVER)/include
  else
      LDFLAGS	+= -L../nsthread -L../nsd
!     INCDIR   = ../include
      ifneq (nsthread,$(LIB))
!         LIBS += -lnsthread
!         ifneq (nsd,$(LIB))
              ifneq (nsthreadtest,$(PGM))
!                 LIBS += -lnsd
              endif
!         endif
      endif
  endif
  
! LIBS        += @TCL_LIB_SPEC@ @TCL_LIBS@ @LDFLAGS@ @LIBS@
! CCLIBS       = $(LIBS) @TCL_LD_FLAGS@
  
  # Install directories
! INSTBIN      = $(NAVISERVER)/bin
! INSTLIB      = $(NAVISERVER)/lib
! INSTMOD      = $(NAVISERVER)/modules
! INSTTCL      = $(NAVISERVER)/modules/tcl
! INSTSRV      = $(NAVISERVER)/servers/server1
! INSTSRVMOD   = $(INSTSRV)/modules
! INSTSRVPAG   = $(INSTSRV)/pages
  
  # Platform-specific options.
***************
*** 105,111 ****
  ifneq (,$(findstring SunOS,$(uname)))
      ifneq (,$(findstring 5.6,$(uname)))
!         LIBS+=-lthread -lposix4
      else
!         LIBS+=-lrt
      endif
  endif
--- 105,111 ----
  ifneq (,$(findstring SunOS,$(uname)))
      ifneq (,$(findstring 5.6,$(uname)))
!         LIBS += -lthread -lposix4
      else
!         LIBS += -lrt
      endif
  endif
***************
*** 114,120 ****
  ifdef LIBINIT
      ifneq (,$(findstring Darwin,$(uname)))
! 	LDLIB	+= -init _$(LIBINIT)
      else
! 	CFLAGS	+= -D$(LIBINIT)=_init
      endif
  endif
--- 114,120 ----
  ifdef LIBINIT
      ifneq (,$(findstring Darwin,$(uname)))
!         LDLIB += -init _$(LIBINIT)
      else
!         CFLAGS += -D$(LIBINIT)=_init
      endif
  endif

Index: Makefile.module.in
===================================================================
RCS file: /cvsroot/naviserver/naviserver/include/Makefile.module.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.module.in	16 Feb 2005 16:45:44 -0000	1.3
--- Makefile.module.in	27 Apr 2005 05:01:24 -0000	1.4
***************
*** 33,61 ****
  # Makefile.module --
  #
! #	Makefile include for AOLserver modules, libraries, and programs.  Variables to set
! #	before including this file include:
  #
! #	NAVISERVER	naviserver install directory.
! #	MOD		Name of module
! #	MODOBJS		List of module object files (required with MOD)
! #	LIB		Root name of dynamic library (without lib prefix or extension)
! #	LIBOBJS		List of library object files (required with LIB)
! #	PGM		Name of executable program
! #	PGMOBJS		List of program object files (required with PGM)
! #	HDRS		Header files which objects depend on
! #	MODLIBS		Extra module link libraries
! #	LIBLIBS		Extra dynamic library link libraries
! #	PGMLIBS		Extra program link libraries
! #	INSTALL		Extra install directive(s)
! #	CLEAN		Extra clean directive(s)
  #
! #	At least one of PGM, MOD, or LIB must be defined.  For backwards compatibility,
! #	MODOBJS will default to OBJS and MODINST can be used for module install.
  #
! #       For static builds (use configure --disable-shared) the LIB variable is
! #       replaced with ALIB which triggers the linking of the static library.
  #
! #	See ../nsd/Makefile and ../nsdb/Makefile for examples.
! #	
  
  STATIC_BUILD = @STATIC_BUILD@
--- 33,61 ----
  # Makefile.module --
  #
! #     Makefile include for NaviServer modules, libraries, and programs.  Variables to set
! #     before including this file include:
  #
! #     NAVISERVER  naviserver install directory.
! #     MOD         Name of module
! #     MODOBJS     List of module object files (required with MOD)
! #     LIB         Root name of dynamic library (without lib prefix or extension)
! #     LIBOBJS     List of library object files (required with LIB)
! #     PGM         Name of executable program
! #     PGMOBJS     List of program object files (required with PGM)
! #     HDRS        Header files which objects depend on
! #     MODLIBS     Extra module link libraries
! #     LIBLIBS     Extra dynamic library link libraries
! #     PGMLIBS     Extra program link libraries
! #     INSTALL     Extra install directive(s)
! #     CLEAN       Extra clean directive(s)
  #
! #     At least one of PGM, MOD, or LIB must be defined.  For backwards compatibility,
! #     MODOBJS will default to OBJS and MODINST can be used for module install.
  #
! #     For static builds (use configure --disable-shared) the LIB variable is
! #     replaced with ALIB which triggers the linking of the static library.
  #
! #     See nsd/Makefile and nsdb/Makefile for examples.
! #   
  
  STATIC_BUILD = @STATIC_BUILD@
***************
*** 63,76 ****
  ifdef NSBUILD
      ifeq ($(STATIC_BUILD), 1)
!         ALIB 	:= $(LIB)
!         LIB	:=
!         LIBINIT	:= 
      endif
  endif
  
  ifdef MOD
!     BUILD	+= $(MOD)
!     INSTALL 	+= install-mod
!     CLEAN	+= clean-mod
      ifeq ($(origin MODOBJS), undefined)
          MODOBJS	= $(OBJS)
--- 63,76 ----
  ifdef NSBUILD
      ifeq ($(STATIC_BUILD), 1)
!         ALIB    := $(LIB)
!         LIB     :=
!         LIBINIT := 
      endif
  endif
  
  ifdef MOD
!     BUILD     += $(MOD)
!     INSTALL   += install-mod
!     CLEAN     += clean-mod
      ifeq ($(origin MODOBJS), undefined)
          MODOBJS	= $(OBJS)
***************
*** 79,103 ****
  
  ifdef LIB
!     LIBFILE	=  lib$(LIB)$(LIBEXT)
!     BUILD	+= $(LIBFILE)
!     INSTALL 	+= install-lib
!     CLEAN   	+= clean-lib
!     MODLIBS	+= $(LIBFILE)
!     PGMLIBS	+= $(LIBFILE)
  endif
  
  ifdef ALIB
!     ALIBFILE 	= lib$(ALIB).a
!     BUILD	+= $(ALIBFILE)
!     INSTALL	+= install-alib
!     CLEAN	+= clean-alib
!     MODLIBS	+= $(ALIBFILE)
!     PGMLIBS	+= $(ALIBFILE)
  endif
  
  ifdef PGM
!     BUILD	+= $(PGM)
!     INSTALL	+= install-pgm
!     CLEAN	+= clean-pgm
  endif
  
--- 79,103 ----
  
  ifdef LIB
!     LIBFILE	 = lib$(LIB)$(LIBEXT)
!     BUILD   += $(LIBFILE)
!     INSTALL += install-lib
!     CLEAN   += clean-lib
!     MODLIBS += $(LIBFILE)
!     PGMLIBS += $(LIBFILE)
  endif
  
  ifdef ALIB
!     ALIBFILE  = lib$(ALIB).a
!     BUILD    += $(ALIBFILE)
!     INSTALL  += install-alib
!     CLEAN    += clean-alib
!     MODLIBS  += $(ALIBFILE)
!     PGMLIBS  += $(ALIBFILE)
  endif
  
  ifdef PGM
!     BUILD   += $(PGM)
!     INSTALL += install-pgm
!     CLEAN   += clean-pgm
  endif