This commit is contained in:
Lennart Poettering 2008-08-05 20:20:09 +02:00
parent 59135fd54e
commit 21bb91f1b9
8 changed files with 80 additions and 12 deletions

10
.gitignore vendored
View File

@ -1,3 +1,13 @@
ABOUT-NLS
ChangeLog
*~
config.guess
config.rpath
config.sub
intltool-extract.in
intltool-merge.in
intltool-update.in
m4/
aclocal.m4 aclocal.m4
*.cache *.cache
config.h config.h

View File

@ -15,8 +15,15 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with pavucontrol. If not, see <http://www.gnu.org/licenses/>. # along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
EXTRA_DIST = bootstrap.sh README LICENSE EXTRA_DIST = \
SUBDIRS=src doc m4/ChangeLog \
bootstrap.sh \
README LICENSE \
intltool-merge.in \
intltool-update.in \
intltool-extract.in
SUBDIRS=src doc po
MAINTAINERCLEANFILES=README MAINTAINERCLEANFILES=README
noinst_DATA = README noinst_DATA = README
@ -33,11 +40,18 @@ homepage: all dist
cp doc/README.html doc/screenshot.png doc/style.css $$HOME/homepage/private/projects/pavucontrol cp doc/README.html doc/screenshot.png doc/style.css $$HOME/homepage/private/projects/pavucontrol
ln -sf README.html $$HOME/homepage/private/projects/pavucontrol/index.html ln -sf README.html $$HOME/homepage/private/projects/pavucontrol/index.html
DISTCLEANFILES = \
intltool-extract \
intltool-merge \
intltool-update
fedora-snapshot: dist fedora-snapshot: dist
cp $(distdir).tar.gz $$HOME/cvs.fedora/pavucontrol/devel/$(distdir).git`date +%Y%m%d`.tar.gz cp $(distdir).tar.gz $$HOME/cvs.fedora/pavucontrol/devel/$(distdir).git`date +%Y%m%d`.tar.gz
.PHONY: homepage .PHONY: homepage
ACLOCAL_AMFLAGS = -I m4
dist-hook: dist-hook:
if test -d .git ; then \ if test -d .git ; then \
git pull ; \ git pull ; \

View File

@ -48,7 +48,14 @@ else
rm -rf autom4te.cache rm -rf autom4te.cache
rm -f config.cache rm -f config.cache
run_versioned aclocal "$VERSION" rm -f Makefile.am~ configure.ac~
# Evil, evil, evil, evil hack
sed 's/read dummy/\#/' `which gettextize` | sh -s -- --copy --force
test -f Makefile.am~ && mv Makefile.am~ Makefile.am
test -f configure.ac~ && mv configure.ac~ configure.ac
intltoolize --copy --force --automake
run_versioned aclocal "$VERSION" -I m4
run_versioned autoconf 2.59 -Wall run_versioned autoconf 2.59 -Wall
run_versioned autoheader 2.59 run_versioned autoheader 2.59
run_versioned automake "$VERSION" -a -c --foreign run_versioned automake "$VERSION" -a -c --foreign

View File

@ -78,5 +78,19 @@ fi
AM_CONDITIONAL([USE_LYNX], [test "x$lynx" = xyes]) AM_CONDITIONAL([USE_LYNX], [test "x$lynx" = xyes])
AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile doc/README.html]) AM_GNU_GETTEXT([external])
IT_PROG_INTLTOOL([0.35.0])
GETTEXT_PACKAGE=pavucontrol
AC_SUBST([GETTEXT_PACKAGE])
AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
AM_GLIB_GNU_GETTEXT
AC_CONFIG_FILES([
po/Makefile.in
Makefile
src/Makefile
doc/Makefile
doc/README.html])
AC_OUTPUT AC_OUTPUT

12
po/.gitignore vendored Normal file
View File

@ -0,0 +1,12 @@
.intltool-merge-cache
Makefile.in.in
Makevars.template
POTFILES
Rules-quot
boldquot.sed
en@boldquot.header
en@quot.header
insert-header.sin
pavucontrol.pot
quot.sed
remove-potcdate.sin

4
po/POTFILES.in Normal file
View File

@ -0,0 +1,4 @@
[encoding: UTF-8]
src/pavucontrol.desktop.in
src/pavucontrol.glade
src/pavucontrol.cc

View File

@ -16,15 +16,23 @@
# along with pavucontrol. If not, see <http://www.gnu.org/licenses/>. # along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
desktopdir = $(datadir)/applications desktopdir = $(datadir)/applications
gladedir = $(pkgdatadir)
localedir = $(datadir)/locale
bin_PROGRAMS=pavucontrol bin_PROGRAMS=pavucontrol
glade_DATA=pavucontrol.glade
dist_pkgdata_DATA=pavucontrol.glade desktop_in_files=pavucontrol.desktop.in
dist_desktop_DATA=pavucontrol.desktop desktop_DATA=$(desktop_in_files:.desktop.in=.desktop)
pavucontrol_SOURCES=pavucontrol.cc pavucontrol_SOURCES=pavucontrol.cc
pavucontrol_LDADD=$(AM_LDADD) $(GUILIBS_LIBS) $(PULSE_LIBS) pavucontrol_LDADD=$(AM_LDADD) $(GUILIBS_LIBS) $(PULSE_LIBS)
pavucontrol_CXXFLAGS=$(AM_CXXFLAGS) $(GUILIBS_CFLAGS) $(PULSE_CFLAGS) pavucontrol_CXXFLAGS=$(AM_CXXFLAGS) $(GUILIBS_CFLAGS) $(PULSE_CFLAGS)
pavucontrol_CXXFLAGS+=-DGLADE_FILE=\"$(pkgdatadir)/pavucontrol.glade\" pavucontrol_CXXFLAGS+=-DGLADE_FILE=\"$(gladedir)/pavucontrol.glade\"
#pavucontrol_CXXFLAGS+=-DGLADE_FILE=\"pavucontrol.glade\" #pavucontrol_CXXFLAGS+=-DGLADE_FILE=\"pavucontrol.glade\"
EXTRA_DIST = $(glade_DATA) $(desktop_in_files)
CLEANFILES = $(desktop_DATA)
@INTLTOOL_DESKTOP_RULE@

View File

@ -1,12 +1,11 @@
[Desktop Entry] [Desktop Entry]
Version=1.0 Version=1.0
Encoding=UTF-8 Encoding=UTF-8
Name=PulseAudio Volume Control _Name=PulseAudio Volume Control
GenericName=Volume Control _GenericName=Volume Control
Comment=Adjust the volume level _Comment=Adjust the volume level
Exec=pavucontrol Exec=pavucontrol
Icon=multimedia-volume-control Icon=multimedia-volume-control
StartupNotify=true StartupNotify=true
Type=Application Type=Application
Categories=Application;AudioVideo;Audio; Categories=Application;AudioVideo;Audio;
GenericName[en_GB]=Volume Control