Re: sources target and pc-files

[Mike Frysinger]

On Tuesday 22 November 2011 11:36:41 Thomas Dickey wrote:
> On Tue, Nov 22, 2011 at 11:16:46AM -0500, Mike Frysinger wrote:
> >  - don't have the pc-files target `touch address@hidden
> >     - con: .pc files will always get refreshed (but maybe that's fine)
> >             - easy enough to add a `cmp` to the gen-pkgconfig to avoid this
> > 
> > i'm leaning towards the latter solution ...
> 
> something like that, I guess.  A third solution would be to
> make gen-pkgconfig smart enough to generate the right text without
> looking in ../lib/* (perhaps more work than I intended).

maybe something like this ?
-mike

--- a/aclocal.m4
+++ b/aclocal.m4
@@ -5718,6 +5718,7 @@ else
        TEST_ARG2="-l${LIB_NAME}${DFT_ARG_SUFFIX} $TEST_ARG2"
 fi
 
+PC_MODULES_TO_MAKE="ncurses"
 cf_cv_src_modules=
 for cf_dir in $1
 do
@@ -5756,6 +5757,7 @@ do
                                TEST_ARGS="-l${cf_dir}${DFT_ARG_SUFFIX} 
$TEST_ARGS"
                                TEST_ARG2="-l${cf_dir}${DFT_ARG_SUFFIX} 
$TEST_ARG2"
                        fi
+                       PC_MODULES_TO_MAKE="${PC_MODULES_TO_MAKE} ${cf_dir}"
                fi
        fi
 done
@@ -5783,7 +5785,12 @@ if test "x$cf_with_tests" != "xno" ; then
        SRC_SUBDIRS="$SRC_SUBDIRS test"
 fi
 test -z "$MAKE_TERMINFO" && SRC_SUBDIRS="$SRC_SUBDIRS misc"
-test "$cf_with_cxx_binding" != no && SRC_SUBDIRS="$SRC_SUBDIRS c++"
+if test "$cf_with_cxx_binding" != no; then
+       PC_MODULES_TO_MAKE="${PC_MODULES_TO_MAKE} ncurses++"
+       SRC_SUBDIRS="$SRC_SUBDIRS c++"
+fi
+
+AC_SUBST(PC_MODULES_TO_MAKE)
 
 ADA_SUBDIRS=
 if test "x$cf_with_ada" = "xyes" && test "x$cf_cv_prog_gnat_correct" = xyes && 
test -f $srcdir/Ada95/Makefile.in; then
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -112,7 +112,6 @@ install.libs :: $(DESTDIR)$(bindir) ncurses-config
 @address@hidden :: pc-files
 @address@hidden :
 @MAKE_PC_FILES@        $(SHELL) ./gen-pkgconfig
address@hidden@ touch $@
 
 terminfo.tmp : run_tic.sed $(source)
        echo '** adjusting tabset paths'
@@ -148,7 +147,7 @@ tags :
 mostlyclean :
        -rm -f terminfo.tmp
        -rm -f run_tic.sed
address@hidden@ -rm -f *.pc pc-files
address@hidden@ -rm -f *.pc
        -rm -f core tags TAGS *~ *.bak *.ln *.atac trace
 
 clean :: mostlyclean
diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in
index c924bc6..048e5a8 100644
--- a/misc/gen-pkgconfig.in
+++ b/misc/gen-pkgconfig.in
@@ -80,22 +80,9 @@ else
        LDFLAGS="-L\${libdir}"
 fi
 
-for lib in ../lib/*
+for name in @PC_MODULES_TO_MAKE@
 do
-       name=`basename $lib`
-       if test "$name" = "*" ; then
-               break
-       fi
-
-       root=`basename $name "$DFT_DEP_SUFFIX"`
-       if test "$name" = "$root" ; then
-               root=`basename $name "$CXX_LIB_SUFFIX"`
-               if test "$name" = "$root" ; then
-                       continue
-               fi
-       fi
-
-       name=`echo "$name" | sed -e 's/^lib//' -e 's/\..*$//'`
+       name="address@hidden@"
 
        desc="ncurses @address@hidden@NCURSES_MINOR@"
        reqs=
-- 
1.7.6.1

signature.asc
Description: This is a digitally signed message part.