b04f27
build system: configure, Makefile.in: added initial pkgconfig support.
@@ -6,6 +6,15 @@ GIT_REFERENCE_INDEX = @git_reference_index@
|
|
6
6
|
CUSTOM_INSTALL_HEADERS = @custom_install_headers@
|
7
7
|
AVOID_VERSION = @avoid_version@
|
8
8
|
|
9
|
+
PKGNAME = @pkgname@
|
10
|
+
PKGDESC = @pkgdesc@
|
11
|
+
PKGUSRC = @pkgusrc@
|
12
|
+
PKGREPO = @pkgrepo@
|
13
|
+
PKGPSRC = @pkgpsrc@
|
14
|
+
PKGDURL = @pkgdurl@
|
15
|
+
PKGDEFS = @pkgdefs@
|
16
|
+
PKGLIBS = @pkglibs@
|
17
|
+
|
9
18
|
BUILD = @build@
|
10
19
|
HOST = @host@
|
11
20
|
CCHOST = @cchost@
|
@@ -268,9 +277,9 @@ clean: clean-implib
|
|
268
277
|
rm -f $(STATIC_APP)
|
269
278
|
|
270
279
|
|
271
|
-
.display: .display-project
|
272
|
-
.display-
|
273
|
-
.display-config
|
280
|
+
.display: .display-project .display-pkgconf .display-env \
|
281
|
+
.display-tools .display-flags .display-pe .display-elf \
|
282
|
+
.display-dirs .display-build .display-config
|
274
283
|
|
275
284
|
.conf: PAGER ?= less
|
276
285
|
.conf:
|
@@ -284,6 +293,17 @@ clean: clean-implib
|
|
284
293
|
@echo BUILD_DIR:' '$(CURDIR)
|
285
294
|
@echo
|
286
295
|
|
296
|
+
.display-pkgconf:
|
297
|
+
@echo PKGNAME:' '$(PKGNAME)
|
298
|
+
@echo PKGDESC:' '$(PKGDESC)
|
299
|
+
@echo PKGUSRC:' '$(PKGUSRC)
|
300
|
+
@echo PKGREPO:' '$(PKGREPO)
|
301
|
+
@echo PKGPSRC:' '$(PKGPSRC)
|
302
|
+
@echo PKGDURL:' '$(PKGDURL)
|
303
|
+
@echo PKGDEFS:' '$(PKGDEFS)
|
304
|
+
@echo PKGLIBS:' '$(PKGLIBS)
|
305
|
+
@echo
|
306
|
+
|
287
307
|
.display-env:
|
288
308
|
@echo BUILD:' '$(BUILD)
|
289
309
|
@echo HOST:' '$(HOST)
|
@@ -9,6 +9,15 @@ supported switches:
|
|
9
9
|
--avoid-version
|
10
10
|
--source-dir
|
11
11
|
|
12
|
+
--pkgname
|
13
|
+
--pkgdesc
|
14
|
+
--pkgusrc
|
15
|
+
--pkgrepo
|
16
|
+
--pkgpsrc
|
17
|
+
--pkgdurl
|
18
|
+
--pkgdefs
|
19
|
+
--pkglibs
|
20
|
+
|
12
21
|
--prefix
|
13
22
|
--exec-prefix
|
14
23
|
--bindir
|
@@ -165,6 +165,16 @@ common_defaults()
|
|
165
165
|
[ -z "$mb_source_dir" ] && mb_source_dir=$mb_project_dir
|
166
166
|
[ -z "$mb_avoid_version" ] && mb_avoid_version='no'
|
167
167
|
|
168
|
+
# pkgconfig
|
169
|
+
[ -z "$mb_pkgname" ] && mb_pkgname="$mb_default_pkgname"
|
170
|
+
[ -z "$mb_pkgdesc" ] && mb_pkgdesc="$mb_default_pkgdesc"
|
171
|
+
[ -z "$mb_pkgusrc" ] && mb_pkgusrc="$mb_default_pkgusrc"
|
172
|
+
[ -z "$mb_pkgrepo" ] && mb_pkgrepo="$mb_default_pkgrepo"
|
173
|
+
[ -z "$mb_pkgpsrc" ] && mb_pkgpsrc="$mb_default_pkgpsrc"
|
174
|
+
[ -z "$mb_pkgdurl" ] && mb_pkgdurl="$mb_default_pkgdurl"
|
175
|
+
[ -z "$mb_pkgdefs" ] && mb_pkgdefs="$mb_default_pkgdefs"
|
176
|
+
[ -z "$mb_pkglibs" ] && mb_pkglibs="$mb_default_pkglibs"
|
177
|
+
|
168
178
|
# dirs
|
169
179
|
[ -z "$mb_prefix" ] && [ -z "$mb_prefix_set" ] \
|
170
180
|
&& mb_prefix='/usr/local'
|
@@ -440,6 +450,15 @@ config_copy()
|
|
440
450
|
-e 's^@custom_install_headers@^'"$mb_custom_install_headers"'^g' \
|
441
451
|
-e 's^@avoid_version@^'"$mb_avoid_version"'^g' \
|
442
452
|
\
|
453
|
+
-e 's^@pkgname@^'"$mb_pkgname"'^g' \
|
454
|
+
-e 's^@pkgdesc@^'"$mb_pkgdesc"'^g' \
|
455
|
+
-e 's^@pkgusrc@^'"$mb_pkgusrc"'^g' \
|
456
|
+
-e 's^@pkgrepo@^'"$mb_pkgrepo"'^g' \
|
457
|
+
-e 's^@pkgpsrc@^'"$mb_pkgpsrc"'^g' \
|
458
|
+
-e 's^@pkgdurl@^'"$mb_pkgdurl"'^g' \
|
459
|
+
-e 's^@pkgdefs@^'"$mb_pkgdefs"'^g' \
|
460
|
+
-e 's^@pkglibs@^'"$mb_pkglibs"'^g' \
|
461
|
+
\
|
443
462
|
-e 's^@build@^'"$mb_build"'^g' \
|
444
463
|
-e 's^@host@^'"$mb_host"'^g' \
|
445
464
|
-e 's^@target@^'"$mb_target"'^g' \
|
@@ -754,6 +773,39 @@ for arg ; do
|
|
754
773
|
mb_source_dir=${arg#*=}
|
755
774
|
;;
|
756
775
|
|
776
|
+
# pkgconfig
|
777
|
+
--pkgname=*)
|
778
|
+
mb_pkgname=${arg#*=}
|
779
|
+
;;
|
780
|
+
|
781
|
+
--pkgdesc=*)
|
782
|
+
mb_pkgdesc=${arg#*=}
|
783
|
+
;;
|
784
|
+
|
785
|
+
--pkgusrc=*)
|
786
|
+
mb_pkgusrc=${arg#*=}
|
787
|
+
;;
|
788
|
+
|
789
|
+
--pkgrepo=*)
|
790
|
+
mb_pkgrepo=${arg#*=}
|
791
|
+
;;
|
792
|
+
|
793
|
+
--pkgpsrc=*)
|
794
|
+
mb_pkgpsrc=${arg#*=}
|
795
|
+
;;
|
796
|
+
|
797
|
+
--pkgdurl=*)
|
798
|
+
mb_pkgdurl=${arg#*=}
|
799
|
+
;;
|
800
|
+
|
801
|
+
--pkgdefs=*)
|
802
|
+
mb_pkgdefs=${arg#*=}
|
803
|
+
;;
|
804
|
+
|
805
|
+
--pkglibs=*)
|
806
|
+
mb_pkglibs=${arg#*=}
|
807
|
+
;;
|
808
|
+
|
757
809
|
# compatibility
|
758
810
|
--enable-dependency-tracking)
|
759
811
|
;;
|