Skip to content

Commit f259993

Browse files
author
descender
committed
* *: Make installation parallelizable. * configure.ac: Don't change default prefix to /usr. * libvisual-0.3.pc.in: Rename from libvisual.pc.in.
1 parent 54ab5fa commit f259993

File tree

5 files changed

+21
-18
lines changed

5 files changed

+21
-18
lines changed

libvisual/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
SUBDIRS = m4 libvisual po
44

55
pkgconfigdir = $(libdir)/pkgconfig
6-
pkgconfig_DATA = libvisual.pc
6+
pkgconfig_DATA = libvisual-0.3.pc
77

88
install-exec-local: libvisual/lvconfig.h
99
$(mkinstalldirs) $(DESTDIR)$(includedir)/libvisual
10-
file=$(DESTDIR)$(includedir)/libvisual/lvconfig.h; \
10+
file=$(DESTDIR)$(includedir)/libvisual-0.3/libvisual/lvconfig.h; \
1111
if test -r $$file && cmp -s libvisual/lvconfig.h $$file; then :; \
1212
else $(INSTALL_DATA) libvisual/lvconfig.h $$file; fi
1313

libvisual/config.h.in

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@
77
/* GETTEXT package name */
88
#undef GETTEXT_PACKAGE
99

10+
/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
11+
CoreFoundation framework. */
12+
#undef HAVE_CFLOCALECOPYCURRENT
13+
14+
/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
15+
the CoreFoundation framework. */
16+
#undef HAVE_CFPREFERENCESCOPYAPPVALUE
17+
1018
/* Define if the GNU dcgettext() function is already present or preinstalled.
1119
*/
1220
#undef HAVE_DCGETTEXT

libvisual/configure.ac

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
# Process this file with autoconf to produce a configure script.
22

33
AC_PREREQ(2.57)
4-
AC_INIT(Libvisual Library, 0.3.0, [email protected], libvisual)
4+
AC_INIT([Libvisual Library], [0.3.0], [[email protected]], [libvisual])
55
AM_INIT_AUTOMAKE([1.7.0 dist-bzip2])
66

77
AC_CONFIG_HEADER(config.h)
88

9-
AC_PREFIX_DEFAULT(/usr)
10-
119
AC_CANONICAL_HOST
1210

1311
lv_mips=no
@@ -136,7 +134,6 @@ AC_CHECK_LIB([m], [sqrt], [LIBS="-lm $LIBS"],
136134
AC_MSG_ERROR([*** You need the Standard C Math Library to build Libvisual.]))
137135

138136
# Internationalization
139-
ALL_LINGUAS="es_ES es_AR"
140137
GETTEXT_PACKAGE=libvisual
141138
AC_SUBST(GETTEXT_PACKAGE)
142139
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [GETTEXT package name])
@@ -349,7 +346,7 @@ elif test x"$LV_THREAD_CFLAGS" != x; then
349346
fi
350347
AC_SUBST(VISUAL_PKG_CONFIG_DEP)
351348

352-
VISUAL_LIBS="$LIBS -lvisual"
349+
VISUAL_LIBS="$LIBS -lvisual-0.3"
353350
if test x"$LV_THREAD_LIBS" != x; then
354351
VISUAL_LIBS="$LV_THREAD_LIBS $VISUAL_LIBS"
355352
fi
@@ -472,7 +469,7 @@ AC_SUBST(LIBS_DYNAMIC_LOADER, "$libs_dynamic_loader")
472469

473470
AC_SUBST(BUILD_SUBDIRS, "libvisual")
474471

475-
LIBVISUAL_PLUGINS_BASE_DIR="${libdir}/libvisual"
472+
LIBVISUAL_PLUGINS_BASE_DIR="${libdir}/libvisual-0.3"
476473
AC_SUBST(LIBVISUAL_PLUGINS_BASE_DIR)
477474

478475
dnl Output the LibVisual config file
@@ -804,7 +801,7 @@ AC_CONFIG_FILES([
804801
m4/Makefile
805802
po/Makefile.in
806803
Makefile
807-
libvisual.pc
804+
libvisual-0.3.pc
808805
libvisual/Makefile
809806
])
810807
#
@@ -827,4 +824,3 @@ plugins base dir : $plugins_base_dir
827824
compiler : ${CC}
828825
debug enabled : ${debug}
829826
"
830-
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
prefix=@prefix@
22
exec_prefix=@exec_prefix@
33
libdir=@libdir@
4-
includedir=@includedir@
4+
includedir=@includedir@/libvisual-0.3
55
pluginsbasedir=@LIBVISUAL_PLUGINS_BASE_DIR@
66

77
Name: libvisual
@@ -10,4 +10,3 @@ Description: an audio visualisation abstraction library.
1010
Requires: @VISUAL_PKG_CONFIG_DEP@
1111
Libs: -L${libdir} @VISUAL_LIBS@
1212
Cflags: -I${includedir} @VISUAL_CFLAGS@
13-

libvisual/libvisual/Makefile.am

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Process this file with automake to generate a Makefile.in
22

3-
library_includedir = $(includedir)/libvisual
3+
library_includedir = $(includedir)/libvisual-0.3/libvisual
44
library_include_HEADERS = lvconfig.h libvisual.h lv_actor.h \
55
lv_audio.h lv_bin.h lv_common.h lv_fourier.h \
66
lv_input.h lv_event.h lv_keysym.h \
@@ -15,23 +15,23 @@ library_include_HEADERS = lvconfig.h libvisual.h lv_actor.h \
1515
lv_hashlist.h lv_cache.h lv_collection.h \
1616
lv_utils.h lv_os.h lv_math.h lv_gl.h lv_defines.h
1717

18-
lib_LTLIBRARIES = libvisual.la
18+
lib_LTLIBRARIES = libvisual-0.3.la
1919

2020
DEFS = @DEFS@
2121

2222
LIBS += -L. -L$(libdir) $(LV_THREAD_LIBS) @LTLIBINTL@
2323

2424
PLUGPATH = $(libdir)/libvisual
2525

26-
AM_CFLAGS = -DPLUGPATH="\"@LIBVISUAL_PLUGINS_BASE_DIR@\"" \
27-
$(LV_THREAD_CFLAGS)
26+
AM_CFLAGS = -DPLUGPATH="\"$(LIBVISUAL_PLUGINS_BASE_DIR)\"" \
27+
$(LV_THREAD_CFLAGS)
2828

2929
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libvisual \
3030
-I$(top_builddir) -I$(top_builddir)/libvisual
3131

32-
libvisual_la_LDFLAGS = -export-dynamic -no-undefined
32+
libvisual_0_3_la_LDFLAGS = -export-dynamic -no-undefined
3333

34-
libvisual_la_SOURCES = lv_actor.c lv_input.c lv_event.c \
34+
libvisual_0_3_la_SOURCES = lv_actor.c lv_input.c lv_event.c \
3535
lv_bin.c lv_plugin.c lv_video.c lv_video_simd.c lv_mem.c \
3636
lv_audio.c lv_fourier.c lv_list.c lv_log.c lv_palette.c \
3737
lv_libvisual.c lv_songinfo.c lv_morph.c lv_bmp.c lv_param.c \

0 commit comments

Comments
 (0)