From 9583914ba076818ce50dbce10cce990649742952 Mon Sep 17 00:00:00 2001
From: kraxel <kraxel>
Date: Fri, 17 Mar 2006 12:46:41 +0000
Subject: sync up, minor fixes

---
 mk/Autoconf.mk   | 9 ++++++++-
 mk/Compile.mk    | 2 +-
 mk/Maintainer.mk | 2 +-
 mk/Variables.mk  | 8 +++++---
 4 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'mk')

diff --git a/mk/Autoconf.mk b/mk/Autoconf.mk
index 4d25d21..aea4900 100644
--- a/mk/Autoconf.mk
+++ b/mk/Autoconf.mk
@@ -1,7 +1,7 @@
 #
 # simple autoconf system for GNU make
 #
-# (c) 2002-2004 Gerd Knorr <kraxel@bytesex.org>
+# (c) 2002-2006 Gerd Hoffmann <kraxel@suse.de>
 #
 # credits for creating this one go to the autotools people because
 # they managed it to annoy lots of developers and users (including
@@ -110,6 +110,13 @@ ac_resdir = $(shell \
 		echo "/etc/X11" || echo "/usr/X11R6/lib/X11");\
 	$(call ac_fini))
 
+# check if package is installed, via pkg-config
+# args: pkg name
+ac_pkg_config = $(shell \
+	$(call ac_init,for $(1) (using pkg-config));\
+	$(call ac_b_cmd, pkg-config $(1));\
+	$(call ac_fini))
+
 
 ########################################################################
 # build Make.config
diff --git a/mk/Compile.mk b/mk/Compile.mk
index 49dddbf..da14d58 100644
--- a/mk/Compile.mk
+++ b/mk/Compile.mk
@@ -1,7 +1,7 @@
 #
 # some rules to compile stuff ...
 #
-# (c) 2002-2004 Gerd Knorr <kraxel@bytesex.org>
+# (c) 2002-2006 Gerd Hoffmann <kraxel@suse.de>
 #
 # main features:
 #  * autodependencies via "cpp -MD"
diff --git a/mk/Maintainer.mk b/mk/Maintainer.mk
index 5bf9480..62f02d6 100644
--- a/mk/Maintainer.mk
+++ b/mk/Maintainer.mk
@@ -1,7 +1,7 @@
 # just some maintainer stuff for me ...
 ########################################################################
 
-make-sync-dir = $(HOME)/src/gnu-make
+make-sync-dir = $(HOME)/projects/gnu-makefiles
 
 .PHONY: sync
 sync:: distclean
diff --git a/mk/Variables.mk b/mk/Variables.mk
index 930f824..69486f3 100644
--- a/mk/Variables.mk
+++ b/mk/Variables.mk
@@ -29,9 +29,11 @@ INSTALL_DATA	:= $(INSTALL) -m 644
 INSTALL_DIR	:= $(INSTALL) -d
 
 # cflags
-CFLAGS	?= -g -O2
-CFLAGS	+= -Wall -Wmissing-prototypes -Wstrict-prototypes \
-	   -Wpointer-arith -Wunused
+CFLAGS		?= -g -O2
+CXXFLAGS	?= $(CFLAGS)
+CFLAGS		+= -Wall -Wmissing-prototypes -Wstrict-prototypes \
+		   -Wpointer-arith -Wunused
+CXXFLAGS	+= -Wall -Wpointer-arith -Wunused
 
 # add /usr/local to the search path if something is in there ...
 ifneq ($(wildcard /usr/local/include/*.h),)
-- 
cgit