razor: src/Makefile.am@1fd1d221092d

Add INTLLIBS back into librazor_la_LIBADD and also into razor.pc

INTLLIBS was originally added into librazor_la_LIBADD (but not razor.pc)
in 611c84a3f4b4538a65d186050608c17adbf17770 and then removed in
236cfc8ecc5c66288e41bf9b72051a3b18326e1c over concerns that it meant
that building static applications (eg., in plover) required a static
version of libintl. Since then, however, the inclusion of gnulib's
getopt has caused the build to fail without INTLLIBS in librazor_la_LIBADD
with messages of the form:

../gl/.libs/libgnu.a(getopt.o): In function `_getopt_internal_r':
/home/ali/wk/razor/vpath/gl/../../working/gl/getopt.c:808: undefined reference to `libintl_gettext'

while building librazor.dll.a

Thus it appears that INTLLIBS really is needed and should go back into
librazor_la_LIBADD (which fixes the build) and should also be in Libs.private
in razor.pc for static builds. This means that a static version of libintl
will be required (eg., as part of mingw64-gettext-static).

Along the way, razor.pc has also been fixed to avoid overlinking
(https://wiki.openmandriva.org/en/Overlinking_issues_in_packaging)
and a missing include directory that caused the razor executable to
fail to build was added.

     1 ## Process this file with automake to produce Makefile.in

     3 INCLUDES = \

     4 	$(LUA_CFLAGS) \

     5 	$(CURL_CFLAGS) \

     6 	$(EXPAT_CFLAGS) \

     7 	$(RPM_CFLAGS) \

     8 	-I$(top_builddir)/gl -I$(top_srcdir)/gl \

     9 	-I$(top_builddir)/src -I$(top_srcdir)/src \

    10 	-I$(top_builddir)/librazor -I$(top_srcdir)/librazor \

    11 	-DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \

    12 	-DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \

    13 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \

    14 	-DPACKAGE_BIN_DIR=\""$(bindir)"\" \

    15 	-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \

    16 	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\"

    18 bin_PROGRAMS = razor

    19 noinst_PROGRAMS = rpm

    20 check_PROGRAMS = test-driver

    22 razor_SOURCES = main.c import-yum.c

    23 if HAVE_RPMLIB

    24 razor_SOURCES += import-rpmdb.c

    25 endif

    26 razor_LDADD = $(top_builddir)/librazor/librazor.la $(RPM_LIBS) $(EXPAT_LIBS) $(CURL_LIBS) $(LUA_LIBS) $(top_builddir)/gl/libgnu.la $(INTLLIBS) $(EXTRA_LIBS)

    28 rpm_SOURCES = rpm.c

    29 rpm_LDADD = $(top_builddir)/librazor/librazor.la $(LUA_LIBS) $(EXTRA_LIBS)

    31 test_driver_SOURCES = test-driver.c

    32 test_driver_LDADD = $(top_builddir)/librazor/librazor.la $(EXPAT_LIBS) $(EXTRA_LIBS)

    34 TESTS = test-driver

    35 XFAIL_TESTS = test-driver

    37 EXTRA_DIST = 			\

    38 	test.xml

    40 clean-local :

    41 	rm -f *~

author	J. Ali Harlow <ali@juiblex.co.uk>
	Fri Oct 03 15:05:33 2014 +0100 (2014-10-03)
changeset 453	1fd1d221092d
parent 429	51905cfc2bde
child 455	df914f383f5c
permissions	-rw-r--r--