[Glibc-bsd-commits] r5104 - in trunk/freebsd-glue: debian src

[Robert Millan]

Author: rmh
Date: 2013-10-28 21:48:41 +0000 (Mon, 28 Oct 2013)
New Revision: 5104

Modified:
   trunk/freebsd-glue/debian/changelog
   trunk/freebsd-glue/debian/rules
   trunk/freebsd-glue/src/Makefile
Log:
Move CFLAGS to src/Makefile.

Modified: trunk/freebsd-glue/debian/changelog
===================================================================
--- trunk/freebsd-glue/debian/changelog	2013-10-28 00:51:18 UTC (rev 5103)
+++ trunk/freebsd-glue/debian/changelog	2013-10-28 21:48:41 UTC (rev 5104)
@@ -2,10 +2,9 @@
 
   [ Robert Millan ]
   * Disable kernel-specific paths on non-kFreeBSD.
-
-  [ rmh ]
   * Add <osreldate.h> and <sys/limits.h>.
   * Add STAILQ_LAST() to <sys/queue.h>.
+  * Move CFLAGS to src/Makefile.
 
  -- Robert Millan <rmh at debian.org>  Sat, 26 Oct 2013 17:48:31 +0200
 

Modified: trunk/freebsd-glue/debian/rules
===================================================================
--- trunk/freebsd-glue/debian/rules	2013-10-28 00:51:18 UTC (rev 5103)
+++ trunk/freebsd-glue/debian/rules	2013-10-28 21:48:41 UTC (rev 5104)
@@ -1,13 +1,9 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-CFLAGS = -Wall -g -pipe -fPIC -D_GNU_SOURCE \
-	-Werror \
-	-isystem $(CURDIR)/include \
-	$(NULL)
 DESTDIR = $(CURDIR)/debian/tmp
 PATH := /usr/lib/freebsd:$(PATH)
-PMAKE := CFLAGS="$(CFLAGS)" DESTDIR="$(DESTDIR)" make
+PMAKE := DESTDIR="$(DESTDIR)" make
 
 clean:
 	dh_testdir

Modified: trunk/freebsd-glue/src/Makefile
===================================================================
--- trunk/freebsd-glue/src/Makefile	2013-10-28 00:51:18 UTC (rev 5103)
+++ trunk/freebsd-glue/src/Makefile	2013-10-28 21:48:41 UTC (rev 5104)
@@ -14,7 +14,11 @@
 
 LDADD=	-ldb
 
-CFLAGS+=	-D__FREEBSD_LIBC
+CFLAGS = -Wall -g -pipe -fPIC -D_GNU_SOURCE \
+	-Werror \
+	-isystem ../include \
+	-D__FREEBSD_LIBC \
+	${NULL}
 
 SYS!=	dpkg-architecture -qDEB_HOST_GNU_SYSTEM