[Fakeroot-commits] [SCM] fakeroot branch, upstream, updated. debian/1.14.3-200-gb232f8a

[Clint Adams]

The following commit has been merged in the upstream branch:
commit 0a5a277221d24466beb637a423e14c8aee4083fe
Author: Clint Adams <schizo at debian.org>
Date:   Thu Oct 7 15:42:39 2004 +0000

    remove CXXFLAGs
    
    git-archimport-id: fakeroot at packages.debian.org--fakeroot/fakeroot--main--0.0--patch-29

diff --git a/debian/rules b/debian/rules
index 4ae844a..4abcd1d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
-CFLAGS = -W -Wall -std=c99 -pedantic -g
-CXXFLAGS = -W -Wall -g
+CFLAGS = -W -Wall -std=c99 -g
 INSTALL = install
 INSTALL_FILE    = $(INSTALL) -p    -o root -g root  -m  644
 INSTALL_PROGRAM = $(INSTALL) -p    -o root -g root  -m  755
@@ -10,10 +9,8 @@ INSTALL_DIR     = $(INSTALL) -p -d -o root -g root  -m  755
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 CFLAGS += -O0
-CXXFLAGS += -O0
 else
 CFLAGS += -O2
-CXXFLAGS += -O2
 endif
 
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
@@ -26,11 +23,11 @@ build-stamp:
 	$(checkdir)
 
 	mkdir obj objfake obj-tcp objfake-tcp
-	cd obj && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" ../configure --prefix=/usr --mandir=/usr/share/man --libdir=/usr/lib/libfakeroot
-	cd objfake && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" ../fake/configure --prefix=/usr --mandir=/usr/share/man
+	cd obj && CFLAGS="$(CFLAGS)" ../configure --prefix=/usr --mandir=/usr/share/man --libdir=/usr/lib/libfakeroot
+	cd objfake && CFLAGS="$(CFLAGS)" ../fake/configure --prefix=/usr --mandir=/usr/share/man
 
-	cd obj-tcp && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" ../configure --prefix=/usr --mandir=/usr/share/man --libdir=/usr/lib/libfakeroot --with-ipc=tcp --program-suffix=-tcp
-	cd objfake-tcp && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" ../fake/configure --prefix=/usr --mandir=/usr/share/man --program-suffix=-tcp
+	cd obj-tcp && CFLAGS="$(CFLAGS)" ../configure --prefix=/usr --mandir=/usr/share/man --libdir=/usr/lib/libfakeroot --with-ipc=tcp --program-suffix=-tcp
+	cd objfake-tcp && CFLAGS="$(CFLAGS)" ../fake/configure --prefix=/usr --mandir=/usr/share/man --program-suffix=-tcp
 
 	cd obj && $(MAKE)
 	cd objfake && $(MAKE)

-- 
fakeroot