Tidy up common func lib building; distribute all relevant source.
authorDarren Salt <linux@youmustbejoking.demon.co.uk>
Mon, 08 Mar 2010 16:41:13 +0000
changeset 29823040e58de419
parent 2981 710b93a8d80f
child 2983 b8bf86d57be3
Tidy up common func lib building; distribute all relevant source.
ChangeLog
configure.ac
src/aaui/Makefile.am
src/common/Makefile.am
src/common/Makefile.common
src/dfb/Makefile.am
src/fb/Makefile.am
src/xitk/Makefile.am
src/xitk/xine-toolkit/Makefile.am
     1.1 --- a/ChangeLog	Mon Mar 08 15:30:02 2010 +0000
     1.2 +++ b/ChangeLog	Mon Mar 08 16:41:13 2010 +0000
     1.3 @@ -1,6 +1,8 @@
     1.4  xine-ui (0.99.7) unstable; urgency=low
     1.5    (add entries here, newest at the top)
     1.6  
     1.7 +  * Tidy up building of common function libraries; ensure all replacement
     1.8 +    function sources are distributed.
     1.9    * xine.desktop now says that xine can accept files or URLs.
    1.10  
    1.11  xine-ui (0.99.6) unstable; urgency=low
     2.1 --- a/configure.ac	Mon Mar 08 15:30:02 2010 +0000
     2.2 +++ b/configure.ac	Mon Mar 08 16:41:13 2010 +0000
     2.3 @@ -517,7 +517,8 @@
     2.4  dnl
     2.5  AC_DEFINE([_GNU_SOURCE], [], [enable GNU libc extension])
     2.6  AC_CHECK_LIB(posix4, nanosleep)
     2.7 -AC_CHECK_FUNCS([getline getsubopt nanosleep strndup strsep strlcat strlcpy])
     2.8 +AC_CHECK_FUNCS([nanosleep])
     2.9 +AC_REPLACE_FUNCS([getline getsubopt strlcat strlcpy strndup strsep])
    2.10  AC_CHECK_HEADERS(string.h strings.h linux/kd.hb execinfo.h)
    2.11  
    2.12  
     3.1 --- a/src/aaui/Makefile.am	Mon Mar 08 15:30:02 2010 +0000
     3.2 +++ b/src/aaui/Makefile.am	Mon Mar 08 16:41:13 2010 +0000
     3.3 @@ -1,3 +1,5 @@
     3.4 +include $(top_srcdir)/src/common/Makefile.common
     3.5 +
     3.6  AM_CFLAGS = @XINE_CFLAGS@
     3.7  
     3.8  if HAVE_AA
     3.9 @@ -13,16 +15,11 @@
    3.10  aaxine_SOURCES = $(GETOPT_C) main.c
    3.11  aaxine_CFLAGS = $(AALIB_CFLAGS) -DAA $(AM_CFLAGS)
    3.12  aaxine_LDADD = @XINE_LIBS@ $(AALIB_LIBS) $(DYNAMIC_LD_LIBS) -lm \
    3.13 -	       $(THREAD_LIBS) \
    3.14 -	       $(top_builddir)/src/common/libcommon.a
    3.15 -aaxine_DEPENDENCIES = $(top_builddir)/src/common/libcommon.a
    3.16 +	       $(THREAD_LIBS) $(LIBCOMMON)
    3.17 +aaxine_DEPENDENCIES = $(LIBCOMMON)
    3.18  
    3.19  cacaxine_SOURCES = $(GETOPT_C) main.c
    3.20  cacaxine_CFLAGS = $(CACA_CFLAGS) -DCACA $(AM_CFLAGS)
    3.21  cacaxine_LDADD = @XINE_LIBS@ $(CACA_LIBS) $(DYNAMIC_LD_LIBS) -lm \
    3.22 -	       $(THREAD_LIBS) \
    3.23 -	       $(top_builddir)/src/common/libcommon.a
    3.24 -cacaxine_DEPENDENCIES = $(top_builddir)/src/common/libcommon.a
    3.25 -
    3.26 -$(top_builddir)/src/common/libcommon.a:
    3.27 -	@cd $(top_builddir)/src/common && $(MAKE) libcommon.a
    3.28 +	       $(THREAD_LIBS) $(LIBCOMMON)
    3.29 +cacaxine_DEPENDENCIES = $(LIBCOMMON)
     4.1 --- a/src/common/Makefile.am	Mon Mar 08 15:30:02 2010 +0000
     4.2 +++ b/src/common/Makefile.am	Mon Mar 08 16:41:13 2010 +0000
     4.3 @@ -14,10 +14,11 @@
     4.4  GETOPT_HDR = getopt.h
     4.5  endif
     4.6  
     4.7 -libcommon_a_SOURCES = $(GETOPT_SRC) utils.c getline.c strndup.c strsep.c strlcpy.c strlcat.c \
     4.8 +libcommon_a_SOURCES = $(GETOPT_SRC) utils.c \
     4.9  	config_wrapper.c config_wrapper.h \
    4.10  	dump.c           dump.h           \
    4.11  	globals.c globals.h
    4.12 +libcommon_a_LIBADD = @LIBOBJS@
    4.13  
    4.14  libcommonx_a_SOURCES = x11utils.c
    4.15  
     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/src/common/Makefile.common	Mon Mar 08 16:41:13 2010 +0000
     5.3 @@ -0,0 +1,9 @@
     5.4 +LIBCOMMON = $(top_builddir)/src/common/libcommon.a
     5.5 +LIBCOMMONX = $(top_builddir)/src/common/libcommonx.a
     5.6 +
     5.7 +$(LIBCOMMON):
     5.8 +	$(MAKE) -C $(top_builddir)/src/common libcommon.a
     5.9 +
    5.10 +$(LIBCOMMONX):
    5.11 +	$(MAKE) -C $(top_builddir)/src/common libcommonx.a
    5.12 +
     6.1 --- a/src/dfb/Makefile.am	Mon Mar 08 15:30:02 2010 +0000
     6.2 +++ b/src/dfb/Makefile.am	Mon Mar 08 16:41:13 2010 +0000
     6.3 @@ -1,3 +1,4 @@
     6.4 +include $(top_srcdir)/src/common/Makefile.common
     6.5  
     6.6  fontandpointers = cetus.ttf pointer1.png pointer2.png
     6.7  
     6.8 @@ -16,15 +17,10 @@
     6.9  font_DATA = $(fontandpointers)
    6.10  endif
    6.11  
    6.12 -dfbxine_DEPENDENCIES = $(topbuilddir)/src/common/libcommon.a
    6.13 -dfbxine_LDADD = @XINE_LIBS@ $(DIRECTFB_LIBS) -lm $(topbuilddir)/src/common/libcommon.a
    6.14 +dfbxine_DEPENDENCIES = $(LIBCOMMON)
    6.15 +dfbxine_LDADD = @XINE_LIBS@ $(DIRECTFB_LIBS) -lm $(LIBCOMMON)
    6.16  dfbxine_SOURCES = options.c \
    6.17  	dfb.c \
    6.18  	main.c
    6.19  
    6.20 -
    6.21 -
    6.22  noinst_HEADERS = dfb.h
    6.23 -
    6.24 -$(top_builddir)/src/common/libcommon.a:
    6.25 -	@cd $(top_builddir)/src/common && $(MAKE) libcommon.a
     7.1 --- a/src/fb/Makefile.am	Mon Mar 08 15:30:02 2010 +0000
     7.2 +++ b/src/fb/Makefile.am	Mon Mar 08 16:41:13 2010 +0000
     7.3 @@ -1,9 +1,11 @@
     7.4 +include $(top_srcdir)/src/common/Makefile.common
     7.5 +
     7.6  AM_CFLAGS = @XINE_CFLAGS@ $(X_CFLAGS) -DFONTDIR=\"$(XINE_SKINDIR)/../fonts/\"
     7.7  
     7.8  bin_PROGRAMS = fbxine 
     7.9  
    7.10 -fbxine_DEPENDENCIES = $(top_builddir)/src/common/libcommon.a
    7.11 -fbxine_LDADD = @XINE_LIBS@ $(LIRC_LIBS) -lm $(THREAD_LIBS) $(top_builddir)/src/common/libcommon.a
    7.12 +fbxine_DEPENDENCIES = $(LIBCOMMON)
    7.13 +fbxine_LDADD = @XINE_LIBS@ $(LIRC_LIBS) -lm $(THREAD_LIBS) $(LIBCOMMON)
    7.14  
    7.15  fbxine_SOURCES = main.c actions.c keys.c options.c callback.c stdctl.c post.c osd.c
    7.16  noinst_HEADERS = main.h actions.h keys.h options.h callback.h stdctl.h post.h osd.h
    7.17 @@ -11,6 +13,3 @@
    7.18  if HAVE_LIRC
    7.19  fbxine_SOURCES += lirc.c lirc.h
    7.20  endif
    7.21 -
    7.22 -$(top_builddir)/src/common/libcommon.a:
    7.23 -	@cd $(top_builddir)/src/common && $(MAKE) libcommon.a
     8.1 --- a/src/xitk/Makefile.am	Mon Mar 08 15:30:02 2010 +0000
     8.2 +++ b/src/xitk/Makefile.am	Mon Mar 08 16:41:13 2010 +0000
     8.3 @@ -1,3 +1,5 @@
     8.4 +include $(top_srcdir)/src/common/Makefile.common
     8.5 +
     8.6  SUBDIRS = Imlib-light xine-toolkit skins oxine .
     8.7  
     8.8  AM_CFLAGS = @X_CFLAGS@ @XINE_CFLAGS@ @CURL_CFLAGS@ @NVTVSIMPLE_CFLAGS@ @READLINE_INCLUDES@ -I$(top_srcdir)/src/xitk/xine-toolkit
     8.9 @@ -15,9 +17,7 @@
    8.10  EXTRA_PROGRAMS = session_ctrl kbindings_man
    8.11  
    8.12  kbindings_man_CFLAGS = $(AM_CFLAGS) -DKBINDINGS_MAN
    8.13 -kbindings_man_LDADD = @XINE_LIBS@ $(THREAD_LIBS) \
    8.14 -	     $(top_builddir)/src/common/libcommon.a \
    8.15 -             $(INTLLIBS)
    8.16 +kbindings_man_LDADD = @XINE_LIBS@ $(THREAD_LIBS) $(LIBCOMMON) $(INTLLIBS)
    8.17  kbindings_man_SOURCES = kbindings_man.c kbindings_common.c
    8.18  
    8.19  xine_SOURCES = \
    8.20 @@ -65,12 +65,10 @@
    8.21  xine_SOURCES += lirc.c lirc.h
    8.22  endif
    8.23  
    8.24 -xine_LDADD = $(XINE_LIBS) \
    8.25 +xine_LDADD = $(XINE_LIBS) $(LIBCOMMON) $(LIBCOMMONX) \
    8.26  	     $(top_builddir)/src/xitk/xine-toolkit/libxitk.a \
    8.27               $(top_builddir)/src/xitk/Imlib-light/libImlib-light.a \
    8.28  	     $(top_builddir)/src/xitk/oxine/liboxine.a \
    8.29 -	     $(top_builddir)/src/common/libcommon.a \
    8.30 -             $(top_builddir)/src/common/libcommonx.a \
    8.31  	     $(X_PRE_LIBS) $(LIRC_LIBS) $(XFT_LIBS) \
    8.32  	     $(X_LIBS) $(XTEST_LIBS) $(CURL_LIBS) $(NVTVSIMPLE_LIBS) \
    8.33  	     -lX11 -lXext -lm $(DBG_LIBS) $(XV_LIB) $(LIBPNG_LIBS) $(INTLLIBS) \
    8.34 @@ -78,12 +76,12 @@
    8.35  
    8.36  xine_remote_CFLAGS = $(AM_CFLAGS) -DNETWORK_CLIENT
    8.37  xine_remote_SOURCES = network.c
    8.38 -xine_remote_DEPENDENCIES = $(top_builddir)/src/common/libcommon.a
    8.39 +xine_remote_DEPENDENCIES = $(LIBCOMMON)
    8.40  xine_remote_LDADD = $(LTLIBINTL) $(NET_LIBS) $(THREAD_LIBS) $(READLINE_LIBS) \
    8.41 -	$(top_builddir)/src/common/libcommon.a $(DBG_LIBS)
    8.42 +	$(LIBCOMMON)
    8.43  
    8.44  session_ctrl_CFLAGS = $(AM_CFLAGS)
    8.45 -session_ctrl_LDADD = @XINE_LIBS@ $(top_builddir)/src/common/libcommon.a $(DBG_LIBS)
    8.46 +session_ctrl_LDADD = @XINE_LIBS@ $(LIBCOMMON) $(DBG_LIBS)
    8.47  session_ctrl_SOURCES = session_common.c session_internal.h session.h ctrl_test.c
    8.48  
    8.49  noinst_HEADERS = \
     9.1 --- a/src/xitk/xine-toolkit/Makefile.am	Mon Mar 08 15:30:02 2010 +0000
     9.2 +++ b/src/xitk/xine-toolkit/Makefile.am	Mon Mar 08 16:41:13 2010 +0000
     9.3 @@ -1,3 +1,4 @@
     9.4 +include $(top_srcdir)/src/common/Makefile.common
     9.5  
     9.6  SUBDIRS = po
     9.7  
     9.8 @@ -80,12 +81,10 @@
     9.9  	xitkintl.h
    9.10  
    9.11  test_SOURCES = test.c
    9.12 -test_DEPENDENCIES = libxitk.a \
    9.13 +test_DEPENDENCIES = libxitk.a $(LIBCOMMON) \
    9.14               $(top_builddir)/src/xitk/Imlib-light/libImlib-light.a
    9.15  
    9.16 -test_LDADD = libxitk.a \
    9.17 -             $(top_builddir)/src/xitk/Imlib-light/libImlib-light.a \
    9.18 -	     $(top_builddir)/src/common/libcommon.a \
    9.19 +test_LDADD = $(test_DEPENDENCIES) \
    9.20  	     $(X_PRE_LIBS) $(X_LIBS) $(XFT_LIBS) -lX11 \
    9.21  	     $(THREAD_LIBS) $(LIBPNG_LIBS) $(INTLLIBS)
    9.22