[Phpgroupware-cvs] CVS: packages Makefile,1.2,1.3

[Luca - De Whiskey's - De Vitis <address@hidden>]

Update of /cvsroot/phpgroupware/packages
In directory subversions:/tmp/cvs-serv20853

Modified Files:
        Makefile 
Log Message:
- Minor changes in variables names and find options.
- clean target now clean debian files too.
- Fixed the requirements targets.


Index: Makefile
===================================================================
RCS file: /cvsroot/phpgroupware/packages/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile    30 Jun 2002 10:58:15 -0000      1.2
--- Makefile    22 Jul 2002 00:09:58 -0000      1.3
***************
*** 37,46 ****
  EXCLUDED_MODULES += syncml-server
  EXCLUDED_MODULES += old
! EXCLUDED_MODULES_PATHS = -path \. -or $(CVS)
  EXCLUDED_MODULES_PATHS += $(patsubst %,-or -path \*%\*,$(EXCLUDED_MODULES))
  MODULES_PATHS = -type d -maxdepth 1 -not \( $(EXCLUDED_MODULES_PATHS) \)
  MODULES := $(shell find $(MODULES_PATHS) -printf "%f ") 
  
! EXCLUDED_SOURCE_FILES = -name \*.sgml -or $(CVS)
  SOURCE_FILES = -type f -not \( $(EXCLUDED_SOURCE_FILES) \)
  
--- 37,46 ----
  EXCLUDED_MODULES += syncml-server
  EXCLUDED_MODULES += old
! EXCLUDED_MODULES_PATHS = -path \. -or $(CVS) -or -path \*$(BUILD_DIRECTORY)\*
  EXCLUDED_MODULES_PATHS += $(patsubst %,-or -path \*%\*,$(EXCLUDED_MODULES))
  MODULES_PATHS = -type d -maxdepth 1 -not \( $(EXCLUDED_MODULES_PATHS) \)
  MODULES := $(shell find $(MODULES_PATHS) -printf "%f ") 
  
! EXCLUDED_SOURCE_FILES = -name \*.sgml -or $(CVS) -or -path 
\*$(BUILD_DIRECTORY)\*
  SOURCE_FILES = -type f -not \( $(EXCLUDED_SOURCE_FILES) \)
  
***************
*** 89,97 ****
  # 
-----------------------------------------------------------------------------
  
! build: $(FORMATS)
  
! $(FORMATS): % : $(foreach module,$(MODULES),$(module).%.builded) 
%.requirements
  
! ALL_BUILDED = $(foreach format,$(FORMATS),%.$(format).builded)
  
  $(MODULES): % : %.all.builded
--- 89,97 ----
  # 
-----------------------------------------------------------------------------
  
! build: $(PACKAGES)
  
! $(PACKAGES): % : %.requirements $(foreach 
module,$(MODULES),$(module).%.builded)
  
! ALL_BUILDED = $(foreach format,$(PACKAGES),%.$(format).builded)
  
  $(MODULES): % : %.all.builded
***************
*** 102,135 ****
  # Rules to check requirements
  # 
-----------------------------------------------------------------------------
! require = $(foreach command,$(subst -,_,$(1)), \
!       $(if $(shell which $(command)), \
!               touch $(@) ; \
!       , \
!               $(error Command not found: `$(1)') \
!       ) \
! )
  
! requirements: $(FORMATS:%=%.requirements)
  
  default.requirements:
!       $(call require,sgmltools dpkg-parsechangelog)
  
  tar.gz.requirements: default.requirements
!       $(call require,tar gzip)
  
  tar.bz2.requirements: default.requirements
!       $(call require,tar bzip2)
  
  orig.tar.gz.requirements: tar.gz.requirements
!       $(call require,find install)
  
  deb.requirements: orig.tar.gz.requirements
!       $(call require,fakeroot dch)
  
  $(foreach format,rpm tgz slp,$(format).requirements): deb.requirements
        $(call require,alien)
  
  pkg.requirements: deb.requirements
!       $(call require,pkginfo pkgtrans)
  # 
-----------------------------------------------------------------------------
  
--- 102,143 ----
  # Rules to check requirements
  # 
-----------------------------------------------------------------------------
! require = $(if $(shell which $(1)),,$(error Command not found: `$(1)'))
  
! requirements: $(PACKAGES:%=%.requirements)
  
  default.requirements:
!       $(call require,find)
!       $(call require,install)
!       $(call require,sgmltools)
!       $(call require,tidy)
!       $(call require,dpkg-parsechangelog)
!       touch $(@)
  
  tar.gz.requirements: default.requirements
!       $(call require,tar)
!       $(call require,gzip)
!       touch $(@)
  
  tar.bz2.requirements: default.requirements
!       $(call require,tar)
!       $(call require,bzip2)
!       touch $(@)
  
  orig.tar.gz.requirements: tar.gz.requirements
!       touch $(@)
  
  deb.requirements: orig.tar.gz.requirements
!       $(call require,fakeroot)
!       $(call require,dch)
!       touch $(@)
  
  $(foreach format,rpm tgz slp,$(format).requirements): deb.requirements
        $(call require,alien)
+       touch $(@)
  
  pkg.requirements: deb.requirements
!       $(call require,pkginfo)
!       $(call require,pkgtrans)
!       touch $(@)
  # 
-----------------------------------------------------------------------------
  
***************
*** 217,222 ****
        $(shell $(SEDN) $(UPSTREAM_VERSION) < 
$(@:$(ORIG_BUILDED)=.source.version))
  ORIG_PACKAGE_NAME = $(subst _,-,$(ORIG_MODULE))
! ORIG_SUORCE_DIRECTORY = $(ORIG_PACKAGE_NAME)-$(ORIG_VERSION).orig
! ORIG_BUILD_DIRECTORY = $(BUILD_DIRECTORY)/$(ORIG_SUORCE_DIRECTORY)
  ORIG_TAR_GZ = $(ORIG_PACKAGE_NAME)_$(ORIG_VERSION).orig.tar.gz
  
--- 225,230 ----
        $(shell $(SEDN) $(UPSTREAM_VERSION) < 
$(@:$(ORIG_BUILDED)=.source.version))
  ORIG_PACKAGE_NAME = $(subst _,-,$(ORIG_MODULE))
! ORIG_SOURCE_DIRECTORY = $(ORIG_PACKAGE_NAME)-$(ORIG_VERSION).orig
! ORIG_BUILD_DIRECTORY = $(BUILD_DIRECTORY)/$(ORIG_SOURCE_DIRECTORY)
  ORIG_TAR_GZ = $(ORIG_PACKAGE_NAME)_$(ORIG_VERSION).orig.tar.gz
  
***************
*** 354,358 ****
  # 
-----------------------------------------------------------------------------
  release: build core
!       for format in $(FORMATS) ; do \
                cat *.$${format}.builded | while read file ; do \
                        $(INSTALL_FILE) $${file} 
$(RELEASE_DIRECTORY)/$${format} \
--- 362,366 ----
  # 
-----------------------------------------------------------------------------
  release: build core
!       for format in $(PACKAGES) ; do \
                cat *.$${format}.builded | while read file ; do \
                        $(INSTALL_FILE) $${file} 
$(RELEASE_DIRECTORY)/$${format} \
***************
*** 399,403 ****
                cat $(@:clean=files.compiled) | xargs $(RM) ;\
        fi
!       touch $(@)
  
  clean: $(MODULES:%=%.source.clean)
--- 407,411 ----
                cat $(@:clean=files.compiled) | xargs $(RM) ;\
        fi
!       cd $(@:.source.clean=) && $(DEBIAN_RULES) clean
  
  clean: $(MODULES:%=%.source.clean)
***************
*** 412,414 ****
  # 
-----------------------------------------------------------------------------
  
! .PHONY: build compile clean release install lint core $(MODULES) $(FORMATS)
--- 420,422 ----
  # 
-----------------------------------------------------------------------------
  
! .PHONY: build compile clean release install lint core $(MODULES) $(PACKAGES)