[Fedora-directory-commits] dsbuild gar.conf.mk, 1.1.1.1, 1.2 gar.conf.mk.in, 1.1.1.1, 1.2 gar.lib.mk, 1.3, 1.4 gar.mk, 1.1.1.1, 1.2

Richard Allen Megginson (rmeggins) fedora-directory-commits at redhat.com
Wed Apr 12 22:11:49 UTC 2006


Author: rmeggins

Update of /cvs/dirsec/dsbuild
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32350

Modified Files:
	gar.conf.mk gar.conf.mk.in gar.lib.mk gar.mk 
Log Message:
fix USE_CVS issue - remove all of the install stuff - should make use on Solaris et. al. easier


Index: gar.conf.mk
===================================================================
RCS file: /cvs/dirsec/dsbuild/gar.conf.mk,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- gar.conf.mk	10 Feb 2006 15:28:53 -0000	1.1.1.1
+++ gar.conf.mk	12 Apr 2006 22:11:47 -0000	1.2
@@ -23,101 +23,9 @@
 
 GARCHIVEDIR = $(HOME)/ds-sources
 
-# Set this variable if you want to compile KDE for a 64bit target (x86_64)
-
-#HAVE_64BIT_TARGET = true
-
-# Several variables depend on the target architecture
-
-ifdef HAVE_64BIT_TARGET
-  ENABLE_LIBSUFFIX="--enable-libsuffix=64"
-  TARGET_LIBNAME = lib64
-  TARGET_PLATFORM = linux-g++-64
-  TARGET_PKG_CONFIG_PATH = /usr/lib64/pkgconfig:/usr/local/lib64/pkgconfig
-
-  # *Mandatory* compiler options on x86_64
-  OWN_CFLAGS = -m64 -fPIC
-
-  # Compiler options (optional)
-  OWN_CFLAGS += -O2 -pipe
-
-  # Optional compiler options for gcc >= 3.4.0
-#  OWN_CFLAGS += -march=opteron -O3 -pipe
-
-else
-  ENABLE_LIBSUFFIX=
-  TARGET_LIBNAME = lib
-  TARGET_PLATFORM = linux-g++
-  TARGET_PKG_CONFIG_PATH = /usr/lib/pkgconfig:/usr/local/lib/pkgconfig
-
-  # Compiler options (optional)
-  OWN_CFLAGS = -O2 -pipe
-
-endif
-
-# These are the standard directory name variables from all GNU
-# makefiles.  They're also used by autoconf, and can be adapted
-# for a variety of build systems.
-#
-# TODO: set $(SYSCONFDIR) and $(LOCALSTATEDIR) to never use
-# /usr/etc or /usr/var
-prefix ?= /tmp/fedora-ds-build
-exec_prefix = $(prefix)
-bindir = $(exec_prefix)/bin
-sbindir = $(exec_prefix)/sbin
-libexecdir = $(exec_prefix)/libexec
-datadir = $(prefix)/share
-sysconfdir = $(prefix)/etc
-sharedstatedir = $(prefix)/share
-localstatedir = $(prefix)/var
-libdir = $(exec_prefix)/$(TARGET_LIBNAME)
-infodir = $(BUILD_PREFIX)/info
-lispdir = $(prefix)/share/emacs/site-lisp
-includedir = $(BUILD_PREFIX)/include
-mandir = $(BUILD_PREFIX)/man
-docdir = $(BUILD_PREFIX)/share/doc
-sourcedir = $(BUILD_PREFIX)/src
-
-# the DESTDIR is used at INSTALL TIME ONLY to determine what the
-# filesystem root should be.  The BUILD_PREFIX is the prefix that
-# usurps the DESTDIR.  It should be considered relative to
-# $(DESTDIR).  Thus, if includedir were set to
-# $(BUILD_PREFIX)/include, it would expand out at install time
-# (BUT NO SOONER) to /tmp/gar/../../tmp/build.  The /../../ at
-# the front should be harmless, as .. for / is just / itself.
-DESTDIR ?=
-BUILD_PREFIX ?= $(prefix)
-#BUILD_PREFIX ?= $(ROOTFROMDEST)/tmp/build
-
-# allow us to link to libraries we installed
-CPPFLAGS += -I$(DESTDIR)$(includedir)
-CFLAGS += -I$(DESTDIR)$(includedir) -L$(DESTDIR)$(libdir)
-LDFLAGS += -L$(DESTDIR)$(libdir)
-# allow us to use programs we just built
-PATH := $(DESTDIR)$(bindir):$(DESTDIR)$(sbindir):$(DESTDIR)$(BUILD_PREFIX)/bin:$(DESTDIR)$(BUILD_PREFIX)/sbin:$(PATH)
-LD_LIBRARY_PATH := $(DESTDIR)$(libdir):$(DESTDIR)$(BUILD_PREFIX)/$(TARGET_LIBNAME):$(LD_LIBRARY_PATH)
-
-# This is for foo-config chaos
-PKG_CONFIG_PATH:=$(DESTDIR)$(libdir)/pkgconfig:$(TARGET_PKG_CONFIG_PATH):$(PKG_CONFIG_PATH)
-
-# Now add own flags to CFLAGS
-CFLAGS += $(OWN_CFLAGS)
-
-# Equalise CFLAGS and CXXFLAGS
-CXXFLAGS := $(CFLAGS)
-
 # If you have no following GNU tools installed change these lines
 TAR = tar
 MD5 = md5sum
 
-# make these variables available to configure and build scripts
-# outside of make's realm.
-export DESTDIR prefix exec_prefix bindir sbindir libexecdir datadir sysconfdir
-export sharedstatedir localstatedir libdir infodir lispdir includedir mandir
-export docdir sourcedir
-export CC CXX
-export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS PATH LD_LIBRARY_PATH LD_PRELOAD
-export PKG_CONFIG_PATH BUILD_CLEAN
-
 # prepend the local file listing
 FILE_SITES = file://$(FILEDIR)/ file://$(GARCHIVEDIR)/


Index: gar.conf.mk.in
===================================================================
RCS file: /cvs/dirsec/dsbuild/gar.conf.mk.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- gar.conf.mk.in	10 Feb 2006 15:28:53 -0000	1.1.1.1
+++ gar.conf.mk.in	12 Apr 2006 22:11:47 -0000	1.2
@@ -23,101 +23,9 @@
 
 GARCHIVEDIR = $(HOME)/ds-sources
 
-# Set this variable if you want to compile KDE for a 64bit target (x86_64)
-
-#HAVE_64BIT_TARGET = true
-
-# Several variables depend on the target architecture
-
-ifdef HAVE_64BIT_TARGET
-  ENABLE_LIBSUFFIX="--enable-libsuffix=64"
-  TARGET_LIBNAME = lib64
-  TARGET_PLATFORM = linux-g++-64
-  TARGET_PKG_CONFIG_PATH = /usr/lib64/pkgconfig:/usr/local/lib64/pkgconfig
-
-  # *Mandatory* compiler options on x86_64
-  OWN_CFLAGS = -m64 -fPIC
-
-  # Compiler options (optional)
-  OWN_CFLAGS += -O2 -pipe
-
-  # Optional compiler options for gcc >= 3.4.0
-#  OWN_CFLAGS += -march=opteron -O3 -pipe
-
-else
-  ENABLE_LIBSUFFIX=
-  TARGET_LIBNAME = lib
-  TARGET_PLATFORM = linux-g++
-  TARGET_PKG_CONFIG_PATH = /usr/lib/pkgconfig:/usr/local/lib/pkgconfig
-
-  # Compiler options (optional)
-  OWN_CFLAGS = -O2 -pipe
-
-endif
-
-# These are the standard directory name variables from all GNU
-# makefiles.  They're also used by autoconf, and can be adapted
-# for a variety of build systems.
-#
-# TODO: set $(SYSCONFDIR) and $(LOCALSTATEDIR) to never use
-# /usr/etc or /usr/var
-prefix ?= /tmp/fedora-ds-build
-exec_prefix = $(prefix)
-bindir = $(exec_prefix)/bin
-sbindir = $(exec_prefix)/sbin
-libexecdir = $(exec_prefix)/libexec
-datadir = $(prefix)/share
-sysconfdir = $(prefix)/etc
-sharedstatedir = $(prefix)/share
-localstatedir = $(prefix)/var
-libdir = $(exec_prefix)/$(TARGET_LIBNAME)
-infodir = $(BUILD_PREFIX)/info
-lispdir = $(prefix)/share/emacs/site-lisp
-includedir = $(BUILD_PREFIX)/include
-mandir = $(BUILD_PREFIX)/man
-docdir = $(BUILD_PREFIX)/share/doc
-sourcedir = $(BUILD_PREFIX)/src
-
-# the DESTDIR is used at INSTALL TIME ONLY to determine what the
-# filesystem root should be.  The BUILD_PREFIX is the prefix that
-# usurps the DESTDIR.  It should be considered relative to
-# $(DESTDIR).  Thus, if includedir were set to
-# $(BUILD_PREFIX)/include, it would expand out at install time
-# (BUT NO SOONER) to /tmp/gar/../../tmp/build.  The /../../ at
-# the front should be harmless, as .. for / is just / itself.
-DESTDIR ?=
-BUILD_PREFIX ?= $(prefix)
-#BUILD_PREFIX ?= $(ROOTFROMDEST)/tmp/build
-
-# allow us to link to libraries we installed
-CPPFLAGS += -I$(DESTDIR)$(includedir)
-CFLAGS += -I$(DESTDIR)$(includedir) -L$(DESTDIR)$(libdir)
-LDFLAGS += -L$(DESTDIR)$(libdir)
-# allow us to use programs we just built
-PATH := $(DESTDIR)$(bindir):$(DESTDIR)$(sbindir):$(DESTDIR)$(BUILD_PREFIX)/bin:$(DESTDIR)$(BUILD_PREFIX)/sbin:$(PATH)
-LD_LIBRARY_PATH := $(DESTDIR)$(libdir):$(DESTDIR)$(BUILD_PREFIX)/$(TARGET_LIBNAME):$(LD_LIBRARY_PATH)
-
-# This is for foo-config chaos
-PKG_CONFIG_PATH:=$(DESTDIR)$(libdir)/pkgconfig:$(TARGET_PKG_CONFIG_PATH):$(PKG_CONFIG_PATH)
-
-# Now add own flags to CFLAGS
-CFLAGS += $(OWN_CFLAGS)
-
-# Equalise CFLAGS and CXXFLAGS
-CXXFLAGS := $(CFLAGS)
-
 # If you have no following GNU tools installed change these lines
 TAR = tar
 MD5 = md5sum
 
-# make these variables available to configure and build scripts
-# outside of make's realm.
-export DESTDIR prefix exec_prefix bindir sbindir libexecdir datadir sysconfdir
-export sharedstatedir localstatedir libdir infodir lispdir includedir mandir
-export docdir sourcedir
-export CC CXX
-export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS PATH LD_LIBRARY_PATH LD_PRELOAD
-export PKG_CONFIG_PATH BUILD_CLEAN
-
 # prepend the local file listing
 FILE_SITES = file://$(FILEDIR)/ file://$(GARCHIVEDIR)/


Index: gar.lib.mk
===================================================================
RCS file: /cvs/dirsec/dsbuild/gar.lib.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gar.lib.mk	8 Apr 2006 19:26:49 -0000	1.3
+++ gar.lib.mk	12 Apr 2006 22:11:47 -0000	1.4
@@ -46,7 +46,7 @@
 # get one that doesn't return an error code.
 $(DOWNLOADDIR)/%:
 # no download with cvs - we "extract" the files from CVS instead
-ifndef USE_CVS
+ifdef DISTFILES
 	@if test -f $(COOKIEDIR)/checksum-$*; then : ; else \
 		echo " ==> Grabbing $(call TMSG_ID,$@)"; \
 		for i in $(filter %/$*,$(URLS)); do  \
@@ -106,7 +106,7 @@
 # error out if it mentions the file without an "OK".
 checksum-%: $(CHECKSUM_FILE)
 # no checksum with cvs - we "extract" the files from CVS instead
-ifndef USE_CVS
+ifdef DISTFILES
 	@echo " ==> Running checksum on $(call TMSG_ID,$*)"
 	@if grep -- '$*' $(CHECKSUM_FILE); then \
 		if LC_ALL="C" LANG="C" $(MD5) -c $(CHECKSUM_FILE) 2>&1 | grep -- '$*' | grep -v ':[ ]\+OK'; then \
@@ -290,17 +290,6 @@
 
 #################### CONFIGURE RULES ####################
 
-ifdef HAVE_QT_3_3_INSTALLED
-  TMP_DIRPATHS = --prefix=$(prefix) --exec_prefix=$(exec_prefix) --bindir=$(bindir) --sbindir=$(sbindir) --libexecdir=$(libexecdir) --datadir=$(datadir) --sysconfdir=$(sysconfdir) --sharedstatedir=$(sharedstatedir) --localstatedir=$(localstatedir) --libdir=$(libdir) --infodir=$(infodir) --lispdir=$(lispdir) --includedir=$(includedir) --mandir=$(mandir) --with-qt-dir=$(QTDIR)
-else
-  TMP_DIRPATHS = --prefix=$(prefix) --exec_prefix=$(exec_prefix) --bindir=$(bindir) --sbindir=$(sbindir) --libexecdir=$(libexecdir) --datadir=$(datadir) --sysconfdir=$(sysconfdir) --sharedstatedir=$(sharedstatedir) --localstatedir=$(localstatedir) --libdir=$(libdir) --infodir=$(infodir) --lispdir=$(lispdir) --includedir=$(includedir) --mandir=$(mandir) --with-qt-dir=$(prefix)
-  QTDIR = $(prefix)
-endif
-
-NODIRPATHS += --lispdir
-
-DIRPATHS = $(filter-out $(addsuffix %,$(NODIRPATHS)), $(TMP_DIRPATHS))
-
 # configure a package that has an autoconf-style configure
 # script.
 configure-%/configure:


Index: gar.mk
===================================================================
RCS file: /cvs/dirsec/dsbuild/gar.mk,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- gar.mk	10 Feb 2006 15:28:52 -0000	1.1.1.1
+++ gar.mk	12 Apr 2006 22:11:47 -0000	1.2
@@ -38,13 +38,6 @@
 
 ALLFILES ?= $(DISTFILES) $(PATCHFILES)
 
-INSTALL_DIRS = $(addprefix $(DESTDIR),$(BUILD_PREFIX) $(prefix) $(exec_prefix) $(bindir) $(sbindir) $(libexecdir) $(datadir) $(sysconfdir) $(sharedstatedir) $(localstatedir) $(libdir) $(infodir) $(lispdir) $(includedir) $(mandir) $(foreach NUM,1 2 3 4 5 6 7 8, $(mandir)/man$(NUM)) $(sourcedir))
-
-# These are bad, since exporting them mucks up the dep rules!
-# WORKSRC is added in manually for the manifest rule.
-#export GARDIR FILEDIR DOWNLOADDIR COOKIEDIR WORKDIR WORKSRC EXTRACTDIR
-#export SCRATCHDIR CHECKSUM_FILE MANIFEST_FILE
-
 # For rules that do nothing, display what dependencies they
 # successfully completed
 DONADA = @echo "	[$(call TMSG_ACTION,$@)] complete for $(call TMSG_ID,$(GARNAME))."




More information about the Fedora-directory-commits mailing list