diff options
| author | kraxel <kraxel> | 2006-03-17 12:46:41 +0000 |
|---|---|---|
| committer | kraxel <kraxel> | 2006-03-17 12:46:41 +0000 |
| commit | 9583914ba076818ce50dbce10cce990649742952 (patch) | |
| tree | 95babab75dd8d7a1d7a442311cda8332529fdd2a /mk | |
| parent | f356778e6134001ac1543918f77d7d1217a1a3e7 (diff) | |
| download | fbida-9583914ba076818ce50dbce10cce990649742952.tar.gz | |
sync up, minor fixes
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/Autoconf.mk | 9 | ||||
| -rw-r--r-- | mk/Compile.mk | 2 | ||||
| -rw-r--r-- | mk/Maintainer.mk | 2 | ||||
| -rw-r--r-- | mk/Variables.mk | 8 |
4 files changed, 15 insertions, 6 deletions
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),) |