Browse Source

Its now possible to write panel plugins outside the panel. See the NOTES

file for details and enjoy writing new panel plugins.


(Old svn revision: 3642)
tags/xfce4-panel-4.10.0
Benedikt Meurer 18 years ago
parent
commit
5f8c6fff9d
44 changed files with 404 additions and 246 deletions
  1. +1
    -0
      AUTHORS
  2. +18
    -4
      Makefile.am
  3. +22
    -6
      Makefile.in
  4. +20
    -0
      NOTES
  5. +0
    -27
      aclocal.m4
  6. +63
    -18
      configure
  7. +8
    -5
      configure.ac
  8. +20
    -13
      ltcf-c.sh
  9. +44
    -41
      ltconfig
  10. +51
    -14
      ltmain.sh
  11. +6
    -1
      panel/Makefile.am
  12. +53
    -24
      panel/Makefile.in
  13. +1
    -1
      panel/controls.h
  14. +1
    -1
      panel/controls_dialog.h
  15. +1
    -1
      panel/groups.h
  16. +1
    -1
      panel/icons.h
  17. +1
    -1
      panel/item.h
  18. +1
    -1
      panel/item_dialog.h
  19. +1
    -1
      panel/panel.h
  20. +1
    -1
      panel/plugins.h
  21. +1
    -1
      panel/popup.h
  22. +1
    -1
      panel/settings.h
  23. +6
    -6
      panel/xfce.h
  24. +13
    -0
      panel/xfce4-panel-1.0.pc.in
  25. +0
    -1
      plugins/clock/Makefile.am
  26. +0
    -1
      plugins/clock/Makefile.in
  27. +4
    -6
      plugins/clock/clock.c
  28. +0
    -1
      plugins/mailcheck/Makefile.am
  29. +0
    -1
      plugins/mailcheck/Makefile.in
  30. +3
    -3
      plugins/mailcheck/mailcheck.c
  31. +0
    -1
      plugins/pager/Makefile.am
  32. +0
    -1
      plugins/pager/Makefile.in
  33. +5
    -5
      plugins/pager/pager.c
  34. +0
    -1
      plugins/switcher/Makefile.am
  35. +0
    -1
      plugins/switcher/Makefile.in
  36. +8
    -5
      plugins/switcher/switcher.c
  37. +0
    -1
      plugins/systembuttons/Makefile.am
  38. +0
    -1
      plugins/systembuttons/Makefile.in
  39. +5
    -2
      plugins/systembuttons/systembuttons.c
  40. +0
    -1
      settings/Makefile.am
  41. +0
    -1
      settings/Makefile.in
  42. +1
    -1
      settings/xfce_settings_plugin.c
  43. +22
    -22
      themes/FreeIcons/Makefile.am
  44. +21
    -21
      themes/FreeIcons/Makefile.in

+ 1
- 0
AUTHORS View File

@@ -7,3 +7,4 @@ Martin Loschwitz <madkiss@users.sourceforge.net>
Xavier Maillard <zedek@fxgsproject.org>
Michael Mosier <michael@spyonit.com>
Erik Touve <etouve@earthlink.net>
Benedikt Meurer <benedikt.meurer@unix-ag.uni-siegen.de>

+ 18
- 4
Makefile.am View File

@@ -1,16 +1,30 @@
@SET_MAKE@

confdir = $(sysconfdir)/xfce4

conf_DATA = xfce4rc

EXTRA_DIST = xfce4rc.in xfce4.spec.in HACKING .indent.pro
EXTRA_DIST = \
HACKING \
NOTES \
PLUGIN.NOTES
xfce4rc.in \
xfce4.spec.in \
.indent.pro

SUBDIRS = po doc icons panel settings plugins themes
SUBDIRS = \
po \
doc \
icons \
panel \
settings \
plugins \
themes

distclean-local:
rm -rf xfce4rc xfce4.spec *.cache
rm -rf xfce4rc xfce4.spec *.cache *~

rpm: dist
rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
@rm -f $(PACKAGE)-$(VERSION).tar.gz

ACLOCAL_AMFLAGS = -I m4

+ 22
- 6
Makefile.in View File

@@ -161,12 +161,25 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@

confdir = $(sysconfdir)/xfce4

conf_DATA = xfce4rc

EXTRA_DIST = xfce4rc.in xfce4.spec.in HACKING .indent.pro
EXTRA_DIST = \
HACKING \
NOTES \
PLUGIN.NOTES


SUBDIRS = \
po \
doc \
icons \
panel \
settings \
plugins \
themes


SUBDIRS = po doc icons panel settings plugins themes
ACLOCAL_AMFLAGS = -I m4
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -205,7 +218,7 @@ $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)

$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.ac
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.ac m4/debug.m4 m4/depends.m4 m4/i18n.m4 m4/X11.m4
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)

config.h: stamp-h1
@@ -391,7 +404,7 @@ distcleancheck_listfiles = find . -type f -print
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
$(mkinstalldirs) $(distdir)/. $(distdir)/po
$(mkinstalldirs) $(distdir)/. $(distdir)/panel $(distdir)/po
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@@ -599,9 +612,12 @@ uninstall-info: uninstall-info-recursive
uninstall-info-am uninstall-info-recursive uninstall-recursive

@SET_MAKE@
xfce4rc.in \
xfce4.spec.in \
.indent.pro

distclean-local:
rm -rf xfce4rc xfce4.spec *.cache
rm -rf xfce4rc xfce4.spec *.cache *~

rpm: dist
rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz


+ 20
- 0
NOTES View File

@@ -5,3 +5,23 @@ Developer notes:
or gettextize in this directory, as it'll break the locales
install stuff. If you think you need to change something,
ask Benedikt Meurer first (benedikt.meurer@unix-ag.uni-siegen.de).

* Theres now a xfce4-panel-1.0.pc file for use with external panel
plugins. In addition the panel header files are now installed into
$(includedir)/xfce4/panel, so if you want to use them in your
code, refer to them as <panel/whatever.h>.
To compile a panel plugin add the output of
pkg-config --cflags xfce4-panel-1.0
to your CFLAGS and the output of
pkg-config --libs xfce4-panel-1.0
to your LIBS. The plugin needs to be installed into the panels
plugin in order to be found by the panel. To get the path to
the plugins directory use the following command:

pkg-config --variable=pluginsdir xfce4-panel-1.0

Have fun with writing new panel plugins.

+ 0
- 27
aclocal.m4 View File

@@ -889,33 +889,6 @@ AC_DEFUN([AM_MAINTAINER_MODE],

AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])

# isc-posix.m4 serial 2 (gettext-0.11.2)
dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
dnl that contains a configuration script generated by Autoconf, under
dnl the same distribution terms as the rest of that program.

# This file is not needed with autoconf-2.53 and newer. Remove it in 2005.

# This test replaces the one in autoconf.
# Currently this macro should have the same name as the autoconf macro
# because gettext's gettext.m4 (distributed in the automake package)
# still uses it. Otherwise, the use in gettext.m4 makes autoheader
# give these diagnostics:
# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX

undefine([AC_ISC_POSIX])

AC_DEFUN([AC_ISC_POSIX],
[
dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
]
)


# serial 46 AC_PROG_LIBTOOL
AC_DEFUN([AC_PROG_LIBTOOL],


+ 63
- 18
configure View File

@@ -1573,7 +1573,7 @@ fi

# Define the identity of the package.
PACKAGE=xfce4
VERSION=0.9
VERSION=0.10


cat >>confdefs.h <<_ACEOF
@@ -3025,14 +3025,13 @@ fi
rm -f conftest*



echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6
if test "${ac_cv_lib_cposix_strerror+set}" = set; then
echo "$as_me:$LINENO: checking for library containing strerror" >&5
echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6
if test "${ac_cv_search_strerror+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcposix $LIBS"
ac_func_search_save_LIBS=$LIBS
ac_cv_search_strerror=no
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
@@ -3068,23 +3067,69 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_cposix_strerror=yes
ac_cv_search_strerror="none required"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

ac_cv_lib_cposix_strerror=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
if test "$ac_cv_search_strerror" = no; then
for ac_lib in cposix; do
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */

/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char strerror ();
int
main ()
{
strerror ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_search_strerror="-l$ac_lib"
break
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

fi
echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5
echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6
if test $ac_cv_lib_cposix_strerror = yes; then
LIBS="$LIBS -lcposix"
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
done
fi
LIBS=$ac_func_search_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
echo "${ECHO_T}$ac_cv_search_strerror" >&6
if test "$ac_cv_search_strerror" != no; then
test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS"


fi

echo "$as_me:$LINENO: checking for ANSI C header files" >&5
echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
@@ -5077,7 +5122,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
case $host in
*-*-irix6*)
# Find out which ABI we are using.
echo '#line 5080 "configure"' > conftest.$ac_ext
echo '#line 5125 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -8099,7 +8144,6 @@ echo "$as_me: error: X Window system libraries and header files are required" >&




succeeded=no

if test -z "$PKG_CONFIG"; then
@@ -8711,7 +8755,7 @@ echo "${ECHO_T}yes" >&6
fi


ac_config_files="$ac_config_files xfce4.spec xfce4rc Makefile doc/Makefile doc/images/Makefile doc/html/Makefile doc/xml/Makefile po/Makefile.in icons/Makefile panel/Makefile plugins/Makefile plugins/mailcheck/Makefile plugins/clock/Makefile plugins/switcher/Makefile plugins/systembuttons/Makefile plugins/pager/Makefile settings/Makefile themes/Makefile themes/Crystal/Makefile themes/Curve/Makefile themes/FreeIcons/Makefile themes/Gnome/Makefile themes/Noia/Makefile themes/XFce/Makefile"
ac_config_files="$ac_config_files xfce4.spec xfce4rc Makefile doc/Makefile doc/images/Makefile doc/html/Makefile doc/xml/Makefile po/Makefile.in icons/Makefile panel/Makefile panel/xfce4-panel-1.0.pc plugins/Makefile plugins/mailcheck/Makefile plugins/clock/Makefile plugins/switcher/Makefile plugins/systembuttons/Makefile plugins/pager/Makefile settings/Makefile themes/Makefile themes/Crystal/Makefile themes/Curve/Makefile themes/FreeIcons/Makefile themes/Gnome/Makefile themes/Noia/Makefile themes/XFce/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -9285,6 +9329,7 @@ do
"po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
"icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES icons/Makefile" ;;
"panel/Makefile" ) CONFIG_FILES="$CONFIG_FILES panel/Makefile" ;;
"panel/xfce4-panel-1.0.pc" ) CONFIG_FILES="$CONFIG_FILES panel/xfce4-panel-1.0.pc" ;;
"plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugins/Makefile" ;;
"plugins/mailcheck/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugins/mailcheck/Makefile" ;;
"plugins/clock/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugins/clock/Makefile" ;;


+ 8
- 5
configure.ac View File

@@ -2,12 +2,14 @@ dnl configure.ac
dnl
dnl xfce4 - panel for the XFce Desktop environment
dnl
dnl 2003 Benedikt Meurer <benedikt.meurer@unix-ag.uni-siegen.de>
dnl

AC_INIT([panel/main.c])

AM_CONFIG_HEADER([config.h])

AM_INIT_AUTOMAKE([xfce4], [0.9])
AM_INIT_AUTOMAKE([xfce4], [0.10])

AM_MAINTAINER_MODE

@@ -32,15 +34,15 @@ BM_I18N([xfce4-panel], [de es es_MX fr fi nl ja])
dnl Check for X11 installed
BM_LIBX11_REQUIRE

dnl AC_CHECK_LIB(Xext, main,, AC_MSG_ERROR([The X Window System installed on this machine does not support the shape extension]), $X_CFLAGS $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS)

dnl Check for required packages
BM_DEPEND([LIBXFCE4MCS_CLIENT], [libxfce4mcs-client-1.0], [0.0.3])
BM_DEPEND([LIBXFCEGUI4], [libxfcegui4-1.0], [0.0.17])
BM_DEPEND([LIBXML], [libxml-2.0], [2.4.0])
BM_DEPEND([XFCE_MCS_MANAGER], [xfce-mcs-manager], [0.1])

BM_DEPEND_CHECK(LIBSTARTUP_NOTIFICATION, libstartup-notification-1.0, 0.4,
[startup-notification], [startup notification library])
dnl Check for optional packages
BM_DEPEND_CHECK([LIBSTARTUP_NOTIFICATION], [libstartup-notification-1.0],
[0.4], [startup-notification], [startup notification library])

dnl Check for debugging support
BM_DEBUG_SUPPORT
@@ -56,6 +58,7 @@ doc/xml/Makefile
po/Makefile.in
icons/Makefile
panel/Makefile
panel/xfce4-panel-1.0.pc
plugins/Makefile
plugins/mailcheck/Makefile
plugins/clock/Makefile


+ 20
- 13
ltcf-c.sh View File

@@ -173,23 +173,13 @@ EOF
$CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
;;

darwin* | rhapsody*)
allow_undefined_flag='-undefined suppress'
archive_cmds='$CC `test .$module = .yes && echo -bundle || echo -dynamiclib` $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts -install_name $rpath/$soname `test -n "$verstring" -a x$verstring != x0.0 && echo $verstring`'
# We need to add '_' to the symbols in $export_symbols first
#archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
hardcode_direct=yes
hardcode_shlibpath_var=no
whole_archive_flag_spec='-all_load $convenience'
;;

netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
fi
;;

@@ -379,6 +369,23 @@ else
fix_srcfile_path='`cygpath -w "$srcfile"`'
;;

darwin* | rhapsody*)
case "$host_os" in
rhapsody* | darwin1.[012])
allow_undefined_flag='-undefined suppress'
;;
*) # Darwin 1.3 on
allow_undefined_flag='-flat_namespace -undefined suppress'
;;
esac
archive_cmds='$CC $(if test .$module = .yes; then echo -bundle; else echo -dynamiclib; fi) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts -install_name $rpath/$soname $verstring'
# We need to add '_' to the symbols in $export_symbols first
#archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols $lib'
hardcode_direct=yes
hardcode_shlibpath_var=no
whole_archive_flag_spec='-all_load $convenience'
;;

freebsd1*)
ld_shlibs=no
;;
@@ -644,7 +651,7 @@ else
darwin* | rhapsody*)
# PIC is the default on this platform
# Common symbols not allowed in MH_DYLIB files
lt_cv_prog_cc_pic='-fno-common'
ac_cv_prog_cc_pic='-fno-common'
;;
*djgpp*)
# DJGPP does not support shared libraries at all


+ 44
- 41
ltconfig View File

@@ -1104,7 +1104,7 @@ darwin* | rhapsody*)
version_type=darwin
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${versuffix}.`test .$module = .yes && echo so || echo dylib` ${libname}${release}${major}.$`test .$module = .yes && echo so || echo dylib` ${libname}.`test .$module = .yes && echo so || echo dylib`'
library_names_spec='${libname}${release}${versuffix}.`test .$module = .yes && echo so || echo dylib` ${libname}${release}${major}.`test .$module = .yes && echo so || echo dylib` ${libname}.`test .$module = .yes && echo so || echo dylib`'
soname_spec='${libname}${release}${major}.`test .$module = .yes && echo so || echo dylib`'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -1116,16 +1116,17 @@ freebsd1*)

freebsd*)
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
version_type=sunos
case $objformat in
elf*)
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
soname_spec='${libname}${release}.so$major'
need_version=no
need_lc=no
need_lib_prefix=no
;;
freebsd-*)
library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
*)
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
need_version=yes
;;
esac
@@ -1167,7 +1168,7 @@ hpux9* | hpux10* | hpux11*)
;;

irix5* | irix6*)
version_type=irix
version_type=sunos
need_lib_prefix=no
need_version=no
soname_spec='${libname}${release}.so$major'
@@ -1198,7 +1199,7 @@ linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)

# This must be Linux ELF.
linux-gnu*)
version_type=linux
version_type=sunos
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
@@ -1236,6 +1237,8 @@ netbsd*)
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
sys_lib_dlsearch_path_spec="/usr/lib"
sys_lib_search_path_spec="/usr/lib"
;;

newsos6)
@@ -1282,7 +1285,7 @@ sco3.2v5*)
;;

solaris*)
version_type=linux
version_type=sunos
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
@@ -1427,11 +1430,11 @@ void nm_test_func(){}
int main(){nm_test_var='a';nm_test_func();return(0);}
EOF

echo "$progname:1430: checking if global_symbol_pipe works" >&5
if { (eval echo $progname:1431: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then
echo "$progname:1433: checking if global_symbol_pipe works" >&5
if { (eval echo $progname:1434: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then
# Now try to grab the symbols.
nlist=conftest.nm
if { echo "$progname:1434: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
if { echo "$progname:1437: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then

# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
@@ -1483,7 +1486,7 @@ EOF
save_CFLAGS="$CFLAGS"
LIBS="conftstm.$objext"
CFLAGS="$CFLAGS$no_builtin_flag"
if { (eval echo $progname:1486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
if { (eval echo $progname:1489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
pipe_works=yes
else
echo "$progname: failed program was:" >&5
@@ -1587,14 +1590,14 @@ else
if test "X${lt_cv_dlopen+set}" != Xset; then
lt_cv_dlopen=no lt_cv_dlopen_libs=
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
echo "$progname:1590: checking for dlopen in -ldl" >&5
echo "$progname:1593: checking for dlopen in -ldl" >&5
if test "X${ac_cv_lib_dl_dlopen+set}" = Xset; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1597 "ltconfig"
#line 1600 "ltconfig"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
@@ -1607,7 +1610,7 @@ int main() {
dlopen()
; return 0; }
EOF
if { (eval echo $progname:1610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo $progname:1613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_lib_dl_dlopen=yes
else
@@ -1626,12 +1629,12 @@ if test "X$ac_cv_lib_dl_dlopen" = Xyes; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlopen""... $ac_c" 1>&6
echo "$progname:1629: checking for dlopen" >&5
echo "$progname:1632: checking for dlopen" >&5
if test "X${ac_cv_func_dlopen+set}" = Xset; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1634 "ltconfig"
#line 1637 "ltconfig"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dlopen(); below. */
#include <assert.h>
@@ -1656,7 +1659,7 @@ dlopen();

; return 0; }
EOF
if { (eval echo $progname:1659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo $progname:1662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_func_dlopen=yes
else
@@ -1673,14 +1676,14 @@ if test "X$ac_cv_func_dlopen" = Xyes; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
echo "$progname:1676: checking for dlopen in -lsvld" >&5
echo "$progname:1679: checking for dlopen in -lsvld" >&5
if test "X${ac_cv_lib_svld_dlopen+set}" = Xset; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lsvld $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1683 "ltconfig"
#line 1686 "ltconfig"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
@@ -1693,7 +1696,7 @@ int main() {
dlopen()
; return 0; }
EOF
if { (eval echo $progname:1696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo $progname:1699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_lib_svld_dlopen=yes
else
@@ -1712,14 +1715,14 @@ if test "X$ac_cv_lib_svld_dlopen" = Xyes; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
echo "$progname:1715: checking for dld_link in -ldld" >&5
echo "$progname:1718: checking for dld_link in -ldld" >&5
if test "X${ac_cv_lib_dld_dld_link+set}" = Xset; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-ldld $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1722 "ltconfig"
#line 1725 "ltconfig"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
@@ -1732,7 +1735,7 @@ int main() {
dld_link()
; return 0; }
EOF
if { (eval echo $progname:1735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo $progname:1738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_lib_dld_dld_link=yes
else
@@ -1751,12 +1754,12 @@ if test "X$ac_cv_lib_dld_dld_link" = Xyes; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for shl_load""... $ac_c" 1>&6
echo "$progname:1754: checking for shl_load" >&5
echo "$progname:1757: checking for shl_load" >&5
if test "X${ac_cv_func_shl_load+set}" = Xset; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1759 "ltconfig"
#line 1762 "ltconfig"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shl_load(); below. */
#include <assert.h>
@@ -1781,7 +1784,7 @@ shl_load();

; return 0; }
EOF
if { (eval echo $progname:1784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo $progname:1787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_func_shl_load=yes
else
@@ -1799,14 +1802,14 @@ if test "X$ac_cv_func_shl_load" = Xyes; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
echo "$progname:1802: checking for shl_load in -ldld" >&5
echo "$progname:1805: checking for shl_load in -ldld" >&5
if test "X${ac_cv_lib_dld_shl_load+set}" = Xset; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-ldld $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1809 "ltconfig"
#line 1812 "ltconfig"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1820,7 +1823,7 @@ int main() {
shl_load()
; return 0; }
EOF
if { (eval echo $progname:1823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo $progname:1826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_lib_dld_shl_load=yes
else
@@ -1867,18 +1870,18 @@ fi
for ac_hdr in dlfcn.h; do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "$progname:1870: checking for $ac_hdr" >&5
echo "$progname:1873: checking for $ac_hdr" >&5
if eval "test \"`echo 'X$''{'ac_cv_header_$ac_safe'+set}'`\" = Xset"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1875 "ltconfig"
#line 1878 "ltconfig"
#include <$ac_hdr>
int fnord = 0;
int main () { return(0); }
EOF
ac_try="$ac_compile >/dev/null 2>conftest.out"
{ (eval echo $progname:1881: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo $progname:1884: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1906,7 +1909,7 @@ done
LIBS="$lt_cv_dlopen_libs $LIBS"

echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
echo "$progname:1909: checking whether a program can dlopen itself" >&5
echo "$progname:1912: checking whether a program can dlopen itself" >&5
if test "X${lt_cv_dlopen_self+set}" = Xset; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1914,7 +1917,7 @@ else
lt_cv_dlopen_self=cross
else
cat > conftest.$ac_ext <<EOF
#line 1917 "ltconfig"
#line 1920 "ltconfig"

#if HAVE_DLFCN_H
#include <dlfcn.h>
@@ -1961,7 +1964,7 @@ int main() {
if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); }

EOF
if { (eval echo $progname:1964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
if { (eval echo $progname:1967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
lt_cv_dlopen_self=yes
else
@@ -1980,7 +1983,7 @@ echo "$ac_t""$lt_cv_dlopen_self" 1>&6
if test "$lt_cv_dlopen_self" = yes; then
LDFLAGS="$LDFLAGS $link_static_flag"
echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
echo "$progname:1983: checking whether a statically linked program can dlopen itself" >&5
echo "$progname:1986: checking whether a statically linked program can dlopen itself" >&5
if test "X${lt_cv_dlopen_self_static+set}" = Xset; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1988,7 +1991,7 @@ else
lt_cv_dlopen_self_static=cross
else
cat > conftest.$ac_ext <<EOF
#line 1991 "ltconfig"
#line 1994 "ltconfig"

#if HAVE_DLFCN_H
#include <dlfcn.h>
@@ -2035,7 +2038,7 @@ int main() {
if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); }

EOF
if { (eval echo $progname:2038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
if { (eval echo $progname:2041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
lt_cv_dlopen_self_static=yes
else


+ 51
- 14
ltmain.sh View File

@@ -211,6 +211,8 @@ do
--mode) prevopt="--mode" prev=mode ;;
--mode=*) mode="$optarg" ;;

--preserve-dup-deps) duplicate_deps="yes" ;;

--quiet | --silent)
show=:
;;
@@ -256,7 +258,7 @@ if test -z "$show_help"; then
# Infer the operation mode.
if test -z "$mode"; then
case $nonopt in
*cc | *++ | gcc* | *-gcc*)
*cc | *++ | gcc* | *-gcc* | *CC)
mode=link
for arg
do
@@ -494,11 +496,21 @@ if test -z "$show_help"; then
# command doesn't match the default compiler.
if test -n "$available_tags" && test -z "$tagname"; then
case $base_compile in
"$CC "*) ;;
"$CC "*) tagname=CC ;;
# Blanks in the command may have been stripped by the calling shell,
# but not from the CC environment variable when ltconfig was run.
"`$echo $CC` "*) ;;
*)
"`$echo $CC` "*) tagname=CC ;;
*) base_compiler=`echo $base_compile | awk '{ print $1 }'`
case $base_compiler in
*cc) tagname=CC ;;
*++)
tagname=CXX
eval "`sed -n -e '/^### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
;;
esac ;;
esac
fi
if test -n "$available_tags" && test -z "$tagname"; then
for z in $available_tags; do
if grep "^### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
# Evaluate the configuration.
@@ -528,8 +540,6 @@ if test -z "$show_help"; then
# else
# echo "$modename: using $tagname tagged configuration"
fi
;;
esac
fi

objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
@@ -1528,11 +1538,21 @@ EOF
# command doesn't match the default compiler.
if test -n "$available_tags" && test -z "$tagname"; then
case $base_compile in
"$CC "*) ;;
"$CC "*) tagname=CC ;;
# Blanks in the command may have been stripped by the calling shell,
# but not from the CC environment variable when ltconfig was run.
"`$echo $CC` "*) ;;
*)
"`$echo $CC` "*) tagname=CC ;;
*) base_compiler=`echo $base_compile | awk '{ print $1 }'`
case $base_compiler in
*cc) tagname=CC ;;
*++)
tagname=CXX
eval "`sed -n -e '/^### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
;;
esac ;;
esac
fi
if test -n "$available_tags" && test -z "$tagname"; then
for z in $available_tags; do
if grep "^### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
# Evaluate the configuration.
@@ -1562,8 +1582,6 @@ EOF
# else
# echo "$modename: using $tagname tagged configuration"
fi
;;
esac
fi

if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
@@ -1619,9 +1637,11 @@ EOF
# Find all interdependent deplibs by searching for libraries
# that are linked more than once (e.g. -la -lb -la)
for deplib in $deplibs; do
if test "X$duplicate_deps" = "Xyes" ; then
case "$libs " in
*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
esac
fi
libs="$libs $deplib"
done

@@ -1632,12 +1652,14 @@ EOF
# $postdeps and mark them as special (i.e., whose duplicates are
# not to be eliminated).
pre_post_deps=
if test "X$duplicate_deps" = "Xyes" ; then
for pre_post_dep in $predeps $postdeps; do
case "$pre_post_deps " in
*" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
esac
pre_post_deps="$pre_post_deps $pre_post_dep"
done
fi
pre_post_deps=
fi

@@ -1861,9 +1883,11 @@ EOF
tmp_libs=
for deplib in $dependency_libs; do
deplibs="$deplib $deplibs"
if test "X$duplicate_deps" = "Xyes" ; then
case "$tmp_libs " in
*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
esac
fi
tmp_libs="$tmp_libs $deplib"
done
elif test $linkmode != prog && test $linkmode != lib; then
@@ -1986,9 +2010,11 @@ EOF
# or/and link against static libraries
newdependency_libs="$deplib $newdependency_libs"
fi
if test "X$duplicate_deps" = "Xyes" ; then
case "$tmp_libs " in
*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
esac
fi
tmp_libs="$tmp_libs $deplib"
done # for deplib
continue
@@ -2287,9 +2313,11 @@ EOF
tmp_libs=
for deplib in $dependency_libs; do
newdependency_libs="$deplib $newdependency_libs"
if test "X$duplicate_deps" = "Xyes" ; then
case "$tmp_libs " in
*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
esac
fi
tmp_libs="$tmp_libs $deplib"
done

@@ -2582,7 +2610,7 @@ EOF
;;

irix)
major=`expr $current - $age + 1`
major=`expr $current - $age`
verstring="sgi$major.$revision"

# Add in all the interfaces that we are compatible with.
@@ -2642,7 +2670,16 @@ EOF
# Clear the version info if we defaulted, and they specified a release.
if test -z "$vinfo" && test -n "$release"; then
major=
verstring="0.0"
case $version_type in
darwin)
# we can't check for "0.0" in archive_cmds due to quoting
# problems, so we reset it completely
verstring=
;;
*)
verstring="0.0"
;;
esac
if test "$need_version" = no; then
versuffix=
else
@@ -5053,7 +5090,7 @@ relink_command=\"$relink_command\""
fi

# Now prepare to actually exec the command.
exec_cmd='"$cmd"$args'
exec_cmd="\$cmd$args"
else
# Display what would be done.
if test -n "$shlibpath_var"; then


+ 6
- 1
panel/Makefile.am View File

@@ -29,7 +29,9 @@ xfce4_panel_SOURCES = \
xfce_support.c \
xfce_support.h

pkginclude_HEADERS = \
xfce4_panelincludedir = $(includedir)/xfce4/panel

xfce4_panelinclude_HEADERS = \
controls.h \
global.h \
icons.h \
@@ -59,3 +61,6 @@ xfce4_panel_LDADD = \
@LIBXFCEGUI4_LIBS@ \
@LIBXFCE4MCS_CLIENT_LIBS@ \
@LIBXML_LIBS@

pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xfce4-panel-1.0.pc

+ 53
- 24
panel/Makefile.in View File

@@ -191,7 +191,9 @@ xfce4_panel_SOURCES = \
xfce_support.h


pkginclude_HEADERS = \
xfce4_panelincludedir = $(includedir)/xfce4/panel

xfce4_panelinclude_HEADERS = \
controls.h \
global.h \
icons.h \
@@ -225,10 +227,13 @@ xfce4_panel_LDADD = \
@LIBXFCE4MCS_CLIENT_LIBS@ \
@LIBXML_LIBS@


pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xfce4-panel-1.0.pc
subdir = panel
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_FILES = xfce4-panel-1.0.pc
bin_PROGRAMS = xfce4-panel$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)

@@ -266,9 +271,12 @@ CCLD = $(CC)
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
DIST_SOURCES = $(xfce4_panel_SOURCES)
HEADERS = $(pkginclude_HEADERS)
DATA = $(pkgconfig_DATA)

HEADERS = $(xfce4_panelinclude_HEADERS)

DIST_COMMON = $(pkginclude_HEADERS) Makefile.am Makefile.in
DIST_COMMON = $(xfce4_panelinclude_HEADERS) Makefile.am Makefile.in \
xfce4-panel-1.0.pc.in
SOURCES = $(xfce4_panel_SOURCES)

all: all-am
@@ -280,6 +288,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configu
$(AUTOMAKE) --foreign panel/Makefile
Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
xfce4-panel-1.0.pc: $(top_builddir)/config.status xfce4-panel-1.0.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
@@ -773,23 +783,41 @@ clean-libtool:
distclean-libtool:
-rm -f libtool
uninstall-info-am:
pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)
install-pkgincludeHEADERS: $(pkginclude_HEADERS)
pkgconfigDATA_INSTALL = $(INSTALL_DATA)
install-pkgconfigDATA: $(pkgconfig_DATA)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
@list='$(pkgconfig_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
echo " $(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f"; \
$(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f; \
done

uninstall-pkgconfigDATA:
@$(NORMAL_UNINSTALL)
@list='$(pkgconfig_DATA)'; for p in $$list; do \
f="`echo $$p | sed -e 's|^.*/||'`"; \
echo " rm -f $(DESTDIR)$(pkgconfigdir)/$$f"; \
rm -f $(DESTDIR)$(pkgconfigdir)/$$f; \
done
xfce4_panelincludeHEADERS_INSTALL = $(INSTALL_HEADER)
install-xfce4_panelincludeHEADERS: $(xfce4_panelinclude_HEADERS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(pkgincludedir)
@list='$(pkginclude_HEADERS)'; for p in $$list; do \
$(mkinstalldirs) $(DESTDIR)$(xfce4_panelincludedir)
@list='$(xfce4_panelinclude_HEADERS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
echo " $(pkgincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f"; \
$(pkgincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f; \
echo " $(xfce4_panelincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(xfce4_panelincludedir)/$$f"; \
$(xfce4_panelincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(xfce4_panelincludedir)/$$f; \
done

uninstall-pkgincludeHEADERS:
uninstall-xfce4_panelincludeHEADERS:
@$(NORMAL_UNINSTALL)
@list='$(pkginclude_HEADERS)'; for p in $$list; do \
@list='$(xfce4_panelinclude_HEADERS)'; for p in $$list; do \
f="`echo $$p | sed -e 's|^.*/||'`"; \
echo " rm -f $(DESTDIR)$(pkgincludedir)/$$f"; \
rm -f $(DESTDIR)$(pkgincludedir)/$$f; \
echo " rm -f $(DESTDIR)$(xfce4_panelincludedir)/$$f"; \
rm -f $(DESTDIR)$(xfce4_panelincludedir)/$$f; \
done

ETAGS = etags
@@ -879,10 +907,10 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
all-am: Makefile $(PROGRAMS) $(HEADERS)
all-am: Makefile $(PROGRAMS) $(DATA) $(HEADERS)

installdirs:
$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(pkgincludedir)
$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(xfce4_panelincludedir)

install: install-am
install-exec: install-exec-am
@@ -925,7 +953,7 @@ info: info-am

info-am:

install-data-am: install-pkgincludeHEADERS
install-data-am: install-pkgconfigDATA install-xfce4_panelincludeHEADERS

install-exec-am: install-binPROGRAMS

@@ -953,7 +981,7 @@ ps: ps-am
ps-am:

uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
uninstall-pkgincludeHEADERS
uninstall-pkgconfigDATA uninstall-xfce4_panelincludeHEADERS

.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
clean-generic clean-libtool ctags distclean distclean-compile \
@@ -961,12 +989,13 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
distclean-tags distdir dvi dvi-am info info-am install \
install-am install-binPROGRAMS install-data install-data-am \
install-exec install-exec-am install-info install-info-am \
install-man install-pkgincludeHEADERS install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-binPROGRAMS \
uninstall-info-am uninstall-pkgincludeHEADERS
install-man install-pkgconfigDATA install-strip \
install-xfce4_panelincludeHEADERS installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
mostlyclean mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
uninstall-am uninstall-binPROGRAMS uninstall-info-am \
uninstall-pkgconfigDATA uninstall-xfce4_panelincludeHEADERS

# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.


+ 1
- 1
panel/controls.h View File

@@ -23,7 +23,7 @@
#include <gmodule.h>
#include <libxml/tree.h>

#include "global.h"
#include <panel/global.h>

typedef gboolean (*CreateControlFunc) (Control * control);



+ 1
- 1
panel/controls_dialog.h View File

@@ -20,7 +20,7 @@
#ifndef __XFCE_CONTROLS_DIALOG_H__
#define __XFCE_CONTROLS_DIALOG_H__

#include "global.h"
#include <panel/global.h>

void controls_dialog (Control * control);



+ 1
- 1
panel/groups.h View File

@@ -20,7 +20,7 @@
#ifndef __XFCE_GROUPS_H__
#define __XFCE_GROUPS_H__

#include "global.h"
#include <panel/global.h>

void groups_init (GtkBox * box);
void groups_pack (GtkBox * box);


+ 1
- 1
panel/icons.h View File

@@ -20,7 +20,7 @@
#ifndef __XFCE_ICONS_H__
#define __XFCE_ICONS_H__

#include "global.h"
#include <panel/global.h>

/* launcher and menu icons */
enum


+ 1
- 1
panel/item.h View File

@@ -20,7 +20,7 @@
#ifndef __XFCE_ITEMS_H
#define __XFCE_ITEMS_H

#include "global.h"
#include <panel/global.h>

enum
{ PANELITEM, MENUITEM };


+ 1
- 1
panel/item_dialog.h View File

@@ -20,7 +20,7 @@
#ifndef __XFCE_ITEM_DIALOG_H__
#define __XFCE_ITEM_DIALOG_H__

#include "global.h"
#include <panel/global.h>

void edit_menu_item_dialog (Item * mi);



+ 1
- 1
panel/panel.h View File

@@ -22,7 +22,7 @@

#include <libxml/tree.h>

#include "global.h"
#include <panel/global.h>

/* Panel */
struct _Panel


+ 1
- 1
panel/plugins.h View File

@@ -23,7 +23,7 @@
#include <glib.h>
#include <gmodule.h>

#include <xfce.h>
#include <panel/xfce.h>

#define XFCE_PLUGIN_API_VERSION 3



+ 1
- 1
panel/popup.h View File

@@ -21,7 +21,7 @@
#define __XFCE_POPUP_H__

#include <libxml/tree.h>
#include "global.h"
#include <panel/global.h>

struct _PanelPopup
{


+ 1
- 1
panel/settings.h View File

@@ -21,7 +21,7 @@
#define __XFCE_XMLCONFIG_H__

#include <libxml/tree.h>
#include "global.h"
#include <panel/global.h>

void write_panel_config (void);



+ 6
- 6
panel/xfce.h View File

@@ -20,11 +20,11 @@
#ifndef __XFCE4_H
#define __XFCE4_H

#include <global.h>
#include <main.h>
#include <panel.h>
#include <controls.h>
#include <icons.h>
#include <xfce_support.h>
#include <panel/global.h>
#include <panel/main.h>
#include <panel/panel.h>
#include <panel/controls.h>
#include <panel/icons.h>
#include <panel/xfce_support.h>

#endif /* __XFCE4_H */

+ 13
- 0
panel/xfce4-panel-1.0.pc.in View File

@@ -0,0 +1,13 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@

pluginsdir=${libdir}/xfce4/plugins

Name: xfce4-panel
Description: XFce4 desktop panel
Requires: libxfcegui4-1.0 libxml-2.0
Version: @VERSION@
Libs: -L${libdir}
Cflags: -I${includedir}/xfce4

+ 0
- 1
plugins/clock/Makefile.am View File

@@ -10,7 +10,6 @@ libclock_la_SOURCES = \
clock.c

libclock_la_CFLAGS = \
-I$(top_srcdir)/panel \
@LIBXFCEGUI4_CFLAGS@ \
@LIBXML_CFLAGS@



+ 0
- 1
plugins/clock/Makefile.in View File

@@ -173,7 +173,6 @@ libclock_la_SOURCES = \


libclock_la_CFLAGS = \
-I$(top_srcdir)/panel \
@LIBXFCEGUI4_CFLAGS@ \
@LIBXML_CFLAGS@



+ 4
- 6
plugins/clock/clock.c View File

@@ -44,12 +44,10 @@
#include <libxfce4util/i18n.h>
#include <libxfcegui4/xfce_clock.h>

#include "global.h"

#include "controls.h"
#include "icons.h"

#include "plugins.h"
#include <panel/global.h>
#include <panel/controls.h>
#include <panel/icons.h>
#include <panel/plugins.h>

#define BORDER 6



+ 0
- 1
plugins/mailcheck/Makefile.am View File

@@ -10,7 +10,6 @@ libmailcheck_la_SOURCES = \
mailcheck.c

libmailcheck_la_CFLAGS = \
-I$(top_srcdir)/panel \
@LIBSTARTUP_NOTIFICATION_CFLAGS@ \
@LIBXFCEGUI4_CFLAGS@ \
@LIBXML_CFLAGS@


+ 0
- 1
plugins/mailcheck/Makefile.in View File

@@ -173,7 +173,6 @@ libmailcheck_la_SOURCES = \


libmailcheck_la_CFLAGS = \
-I$(top_srcdir)/panel \
@LIBSTARTUP_NOTIFICATION_CFLAGS@ \
@LIBXFCEGUI4_CFLAGS@ \
@LIBXML_CFLAGS@


+ 3
- 3
plugins/mailcheck/mailcheck.c View File

@@ -35,9 +35,9 @@
#include <libxfce4util/i18n.h>
#include <libxfcegui4/xfce_iconbutton.h>

#include "xfce.h"
#include "settings.h"
#include "plugins.h"
#include <panel/xfce.h>
#include <panel/settings.h>
#include <panel/plugins.h>

#define MAILCHECK_ROOT "Mailcheck"



+ 0
- 1
plugins/pager/Makefile.am View File

@@ -10,7 +10,6 @@ libpager_la_SOURCES = \
pager.c

libpager_la_CFLAGS = \
-I$(top_srcdir)/panel \
@LIBXFCEGUI4_CFLAGS@ \
@LIBXML_CFLAGS@



+ 0
- 1
plugins/pager/Makefile.in View File

@@ -173,7 +173,6 @@ libpager_la_SOURCES = \


libpager_la_CFLAGS = \
-I$(top_srcdir)/panel \
@LIBXFCEGUI4_CFLAGS@ \
@LIBXML_CFLAGS@



+ 5
- 5
plugins/pager/pager.c View File

@@ -28,11 +28,11 @@
#include <libxfce4util/i18n.h>
#include <libxfcegui4/libxfcegui4.h>

#include "xfce.h"
#include "popup.h"
#include "settings.h"
#include "plugins.h"
#include "mcs_client.h"
#include <panel/xfce.h>
#include <panel/popup.h>
#include <panel/settings.h>
#include <panel/plugins.h>
#include <panel/mcs_client.h>

typedef struct
{


+ 0
- 1
plugins/switcher/Makefile.am View File

@@ -10,7 +10,6 @@ libswitcher_la_SOURCES = \
switcher.c

libswitcher_la_CFLAGS = \
-I$(top_srcdir)/panel \
@LIBX11_CFLAGS@ \
@LIBXFCEGUI4_CFLAGS@ \
@LIBXML_CFLAGS@


+ 0
- 1
plugins/switcher/Makefile.in View File

@@ -173,7 +173,6 @@ libswitcher_la_SOURCES = \


libswitcher_la_CFLAGS = \
-I$(top_srcdir)/panel \
@LIBX11_CFLAGS@ \
@LIBXFCEGUI4_CFLAGS@ \
@LIBXML_CFLAGS@


+ 8
- 5
plugins/switcher/switcher.c View File

@@ -27,11 +27,14 @@
#include <libxfce4util/i18n.h>
#include <libxfcegui4/libxfcegui4.h>

#include "xfce.h"
#include "popup.h"
#include "settings.h"
#include "plugins.h"
#include "mcs_client.h"
#include <panel/xfce.h>
#include <panel/popup.h>
#include <panel/settings.h>
#include <panel/plugins.h>

#if 0
#include <panel/mcs_client.h>
#endif

static int screen_button_width[] = { 35, 45, 80, 80 };



+ 0
- 1
plugins/systembuttons/Makefile.am View File

@@ -10,7 +10,6 @@ libsystembuttons_la_SOURCES = \
systembuttons.c

libsystembuttons_la_CFLAGS = \
-I$(top_srcdir)/panel \
@LIBXFCEGUI4_CFLAGS@ \
@LIBXML_CFLAGS@



+ 0
- 1
plugins/systembuttons/Makefile.in View File

@@ -173,7 +173,6 @@ libsystembuttons_la_SOURCES = \


libsystembuttons_la_CFLAGS = \
-I$(top_srcdir)/panel \
@LIBXFCEGUI4_CFLAGS@ \
@LIBXML_CFLAGS@



+ 5
- 2
plugins/systembuttons/systembuttons.c View File

@@ -30,9 +30,12 @@
#include <libxfce4util/i18n.h>
#include <libxfcegui4/xfce_iconbutton.h>

#include "xfce.h"
#include "plugins.h"
#include <panel/xfce.h>
#include <panel/plugins.h>

#if 0
#include "mcs_client.h"
#endif

/* callbacks */
static void


+ 0
- 1
settings/Makefile.am View File

@@ -14,7 +14,6 @@ libxfce4settings_la_SOURCES = \
xfce_settings_plugin.h

libxfce4settings_la_CFLAGS = \
-I$(top_srcdir)/panel \
@LIBXFCEGUI4_CFLAGS@ \
@LIBXML_CFLAGS@ \
@XFCE_MCS_MANAGER_CFLAGS@ \


+ 0
- 1
settings/Makefile.in View File

@@ -177,7 +177,6 @@ libxfce4settings_la_SOURCES = \


libxfce4settings_la_CFLAGS = \
-I$(top_srcdir)/panel \
@LIBXFCEGUI4_CFLAGS@ \
@LIBXML_CFLAGS@ \
@XFCE_MCS_MANAGER_CFLAGS@ \


+ 1
- 1
settings/xfce_settings_plugin.c View File

@@ -43,7 +43,7 @@
#include "xfce_settings_plugin.h"
#include "xfce_settings_dialog.h"

#include "icons/xfce_icon.xpm"
#include <icons/xfce_icon.xpm>

#define DEFAULT_THEME "Curve"



+ 22
- 22
themes/FreeIcons/Makefile.am View File

@@ -1,25 +1,25 @@
freeiconsdir = $(pkgdatadir)/themes/FreeIcons
freeicons_DATA = \
README \
edit.png \
file1.png \
file2.png \
games.png \
newmail.png \
man.png \
miniinfo.png \
minilock.png \
minipalet.png \
minipower.png \
multimedia.png \
network.png \
nomail.png \
oldmail.png \
paint.png \
print.png \
schedule.png \
sound.png \
terminal.png \
unknown.png
freeicons_DATA = \
README \
edit.png \
file1.png \
file2.png \
games.png \
newmail.png \
man.png \
miniinfo.png \
minilock.png \
minipalet.png \
minipower.png \
multimedia.png \
network.png \
nomail.png \
oldmail.png \
paint.png \
print.png \
schedule.png \
sound.png \
terminal.png \
unknown.png

EXTRA_DIST = $(freeicons_DATA)

+ 21
- 21
themes/FreeIcons/Makefile.in View File

@@ -161,27 +161,27 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
freeiconsdir = $(pkgdatadir)/themes/FreeIcons
freeicons_DATA = \
README \
edit.png \
file1.png \
file2.png \
games.png \
newmail.png \
man.png \
miniinfo.png \
minilock.png \
minipalet.png \
minipower.png \
multimedia.png \
network.png \
nomail.png \
oldmail.png \
paint.png \
print.png \
schedule.png \
sound.png \
terminal.png \
unknown.png
README \
edit.png \
file1.png \
file2.png \
games.png \
newmail.png \
man.png \
miniinfo.png \
minilock.png \
minipalet.png \
minipower.png \
multimedia.png \
network.png \
nomail.png \
oldmail.png \
paint.png \
print.png \
schedule.png \
sound.png \
terminal.png \
unknown.png


EXTRA_DIST = $(freeicons_DATA)


Loading…
Cancel
Save