Fix some errors in the makefiles. Fix dist-check.

13 years ago · 035231eeb6
12 changed files with 108 additions and 86 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -1,10 +1,12 @@
 # $Id$

-SUBDIRS =								\
-	libxfce4panel							\
-	panel								\
-	wrapper								\
-	plugins
+SUBDIRS = \
+	common \
+	libxfce4panel \
+	panel \
+	plugins \
+	po \
+	wrapper

 distclean-local:
 	rm -rf *.spec *.cache *~
@ -14,29 +16,26 @@ rpm: dist
 	@rm -f $(PACKAGE)-$(VERSION).tar.gz

 desktopdir = $(datadir)/applications
-desktop_in_in_files = 							\
-	Panel-desktop-handler.desktop.in				\
-	Panel-preferences.desktop.in.in
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-%.desktop.in: %.desktop.in.in
-	sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@
+desktop_in_files = \
+	panel-desktop-handler.desktop.in \
+	panel-preferences.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@

-EXTRA_DIST = 								\
-	$(desktop_in_in_files)						\
-	intltool-extract.in						\
-	intltool-merge.in						\
+EXTRA_DIST = \
+	$(desktop_in_files) \
+	intltool-extract.in \
+	intltool-merge.in \
 	intltool-update.in

-DISTCLEANFILES =							\
-	$(desktop_in_files)						\
-	$(desktop_DATA)							\
-	intltool-extract						\
-	intltool-merge							\
-	intltool-update
+DISTCLEANFILES = \
+	$(desktop_DATA) \
+	intltool-extract \
+	intltool-merge \
+	intltool-update \
+	intltool-update-tmp

-DISTCHECK_CONFIGURE_FLAGS =						\
+DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-gtk-doc

 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
--- a/configure.in.in
+++ b/configure.in.in
@ -47,17 +47,15 @@ dnl *** Check for UNIX variants ***
 dnl *******************************
 AC_AIX()
 AC_ISC_POSIX()
-AC_MINIX()
-AM_CONDITIONAL([HAVE_CYGWIN], [test "`uname | grep \"CYGWIN\"`" != ""])

 dnl ********************************
 dnl *** Check for basic programs ***
 dnl ********************************
 AC_PROG_CC()
+AM_PROG_CC_C_O()
 AC_PROG_LD()
 AC_PROG_INSTALL()
 AC_PROG_INTLTOOL()
-AC_CHECK_PROGS([PERL], [perl5 perl])

 dnl **************************
 dnl *** Initialize libtool ***
@ -242,6 +240,7 @@ wrapper/Makefile
 plugins/Makefile
 plugins/clock/Makefile
 plugins/launcher/Makefile
+plugins/pager/Makefile
 plugins/separator/Makefile
 plugins/showdesktop/Makefile
 plugins/systray/Makefile
--- a/libxfce4panel/Makefile.am
+++ b/libxfce4panel/Makefile.am
@ -1,59 +1,59 @@
 # $Id$

-INCLUDES = 								\
-	-I$(top_srcdir)							\
-	-DG_LOG_DOMAIN=\"libxfce4panel\"				\
-	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
-	-DLIBXFCE4PANEL_COMPILATION					\
+INCLUDES = \
+	-I$(top_srcdir) \
+	-DG_LOG_DOMAIN=\"libxfce4panel\" \
+	-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+	-DLIBXFCE4PANEL_COMPILATION \
 	$(PLATFORM_CPPFLAGS)

-lib_LTLIBRARIES =							\
+lib_LTLIBRARIES = \
 	libxfce4panel.la

-libxfce4panel_built_sources =						\
-	libxfce4panel-marshal.c						\
+libxfce4panel_built_sources = \
+	libxfce4panel-marshal.c \
 	libxfce4panel-marshal.h

-libxfce4panel_headers =							\
-	libxfce4panel.h							\
-	xfce-arrow-button.h						\
-	xfce-hvbox.h							\
-	xfce-panel-convenience.h					\
-	xfce-panel-macros.h						\
-	xfce-panel-plugin.h						\
+libxfce4panel_headers = \
+	libxfce4panel.h \
+	xfce-arrow-button.h \
+	xfce-hvbox.h \
+	xfce-panel-convenience.h \
+	xfce-panel-enums.h \
+	xfce-panel-macros.h \
+	xfce-panel-plugin.h \
 	xfce-scaled-image.h

-libxfce4panel_includedir =						\
+libxfce4panel_includedir = \
 	$(includedir)/xfce4/libxfce4panel

-libxfce4panel_include_HEADERS =						\
+libxfce4panel_include_HEADERS = \
 	$(libxfce4panel_headers)

-libxfce4panel_la_SOURCES =						\
-	$(libxfce4panel_built_sources)					\
-	$(libxfce4panel_headers)					\
-	xfce-arrow-button.c						\
-	xfce-hvbox.c							\
-	xfce-panel-convenience.c					\
-	xfce-panel-plugin.c						\
-	xfce-panel-plugin-provider.c					\
-	xfce-panel-plugin-provider.h					\
+libxfce4panel_la_SOURCES = \
+	$(libxfce4panel_built_sources) \
+	$(libxfce4panel_headers) \
+	xfce-arrow-button.c \
+	xfce-hvbox.c \
+	xfce-panel-convenience.c \
+	xfce-panel-plugin.c \
+	xfce-panel-plugin-provider.c \
+	xfce-panel-plugin-provider.h \
 	xfce-scaled-image.c

-libxfce4panel_la_CFLAGS =						\
-	$(GTK_CFLAGS)							\
-	$(LIBXFCE4UTIL_CFLAGS)						\
+libxfce4panel_la_CFLAGS =	 \
+	$(GTK_CFLAGS) \
+	$(LIBXFCE4UTIL_CFLAGS) \
 	$(PLATFORM_CFLAGS)

-libxfce4panel_la_LDFLAGS = 						\
-	-no-undefined							\
-	-export-dynamic							\
-	-export-symbols-regex "^[^_].*"					\
-	-version-info $(LIBXFCE4PANEL_VERINFO)				\
+libxfce4panel_la_LDFLAGS = \
+	-no-undefined \
+	-export-dynamic \
+	-version-info $(LIBXFCE4PANEL_VERINFO) \
 	$(PLATFORM_LDFLAGS)

-libxfce4panel_la_LIBADD = 						\
-	$(GTK_LIBS)							\
+libxfce4panel_la_LIBADD = \
+	$(GTK_LIBS) \
 	$(LIBXFCE4UTIL_LIBS)

 #
@ -62,7 +62,7 @@ libxfce4panel_la_LIBADD = 						\
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libxfce4panel-1.0.pc

-EXTRA_DIST =								\
+EXTRA_DIST = \
 	libxfce4panel-marshal.list

 #
@ -75,10 +75,10 @@ libxfce4panel-marshal.h: libxfce4panel-marshal.list Makefile
 libxfce4panel-marshal.c: libxfce4panel-marshal.list Makefile
 	glib-genmarshal --prefix=_libxfce4panel_marshal --body $< > $@

-DISTCLEANFILES =							\
+DISTCLEANFILES = \
 	$(libxfce4panel_built_sources)

-BUILT_SOURCES =								\
+BUILT_SOURCES = \
 	$(libxfce4panel_built_sources)
 endif

--- a/Panel-desktop-handler.desktop.in.in
+++ b/Panel-desktop-handler.desktop.in.in
@ -1,3 +1,4 @@
+
 [Desktop Entry]
 Encoding=UTF-8
 _Name=Create Launcher on Xfce Panel
--- a/Panel-preferences.desktop.in.in
+++ b/Panel-preferences.desktop.in.in
@ -1,3 +1,4 @@
+
 [Desktop Entry]
 Encoding=UTF-8
 Version=1.0
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@ -3,6 +3,7 @@
 SUBDIRS = \
 	clock \
 	launcher \
+	pager \
 	separator \
 	showdesktop \
 	systray \
--- a/plugins/clock/Makefile.am
+++ b/plugins/clock/Makefile.am
@ -12,7 +12,11 @@ plugindir = \
 plugin_LTLIBRARIES = \
 	libclock.la

+libclock_built_sources = \
+	clock-dialog_glade.h
+
 libclock_la_SOURCES = \
+	$(libclock_built_sources) \
 	clock.c \
 	clock.h \
 	clock-analog.c \
@ -53,7 +57,10 @@ libclock_la_DEPENDENCIES = \

 if MAINTAINER_MODE
 BUILT_SOURCES = \
-	clock-dialog_glade.h
+	$(libclock_built_sources)
+
+DISTCLEANFILES = \
+	$(libclock_built_sources)

 clock-dialog_glade.h: clock-dialog.glade
 	exo-csource --static --strip-comments --strip-content --name=clock_dialog_glade $< >$@
@ -63,9 +70,9 @@ endif
 # .desktop file
 #
 desktopdir = $(datadir)/xfce4/panel-plugins
-desktop_in_in_files =	 clock.desktop.in.in
+desktop_in_in_files =	clock.desktop.in.in
 desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-%.desktop.in: %.desktop.in.in
+clock.desktop.in: $(desktop_in_in_files)
 	sed -e "s,\@libdir\@,$(libdir),g" < $< > $@
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
--- a/plugins/launcher/Makefile.am
+++ b/plugins/launcher/Makefile.am
@ -15,12 +15,15 @@ plugindir = \
 plugin_LTLIBRARIES = \
 	liblauncher.la

+liblauncher_built_sources = \
+	launcher-dialog_glade.h
+
 liblauncher_la_SOURCES = \
+	$(liblauncher_built_sources) \
 	launcher.c \
 	launcher.h \
 	launcher-dialog.c \
-	launcher-dialog.h \
-	launcher-dialog_glade.h
+	launcher-dialog.h

 liblauncher_la_CFLAGS = \
 	$(GTK_CFLAGS) \
@ -51,7 +54,10 @@ liblauncher_la_DEPENDENCIES = \

 if MAINTAINER_MODE
 BUILT_SOURCES = \
-	launcher-dialog_glade.h
+	$(liblauncher_built_sources)
+
+DISTCLEANFILES = \
+	$(libclock_built_sources)

 launcher-dialog_glade.h: launcher-dialog.glade
 	exo-csource --static --strip-comments --strip-content --name=launcher_dialog_glade $< >$@
@ -63,7 +69,7 @@ endif
 desktopdir = $(datadir)/xfce4/panel-plugins
 desktop_in_in_files = launcher.desktop.in.in
 desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-%.desktop.in: %.desktop.in.in
+launcher.desktop.in: $(desktop_in_in_files)
 	sed -e "s,\@libdir\@,$(libdir),g" < $< > $@
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
--- a/plugins/separator/Makefile.am
+++ b/plugins/separator/Makefile.am
@ -12,10 +12,13 @@ plugindir = \
 plugin_LTLIBRARIES = \
 	libseparator.la

+libseparator_built_sources = \
+	separator-dialog_glade.h
+
 libseparator_la_SOURCES = \
+	$(libseparator_built_sources) \
 	separator.c \
-	separator.h \
-	separator-dialog_glade.h
+	separator.h

 libseparator_la_CFLAGS = \
 	$(GTK_CFLAGS) \
@ -28,13 +31,9 @@ libseparator_la_CFLAGS = \
 libseparator_la_LDFLAGS = \
 	-avoid-version \
 	-module \
+	-no-undefined \
 	$(PLATFORM_LDFLAGS)

-if HAVE_CYGWIN
-libseparator_la_LDFLAGS += \
-	-no-undefined
-endif
-
 libseparator_la_LIBADD = \
 	$(top_builddir)/libxfce4panel/libxfce4panel.la \
 	$(GTK_LIBS) \
@ -48,7 +47,10 @@ libseparator_la_DEPENDENCIES = \

 if MAINTAINER_MODE
 BUILT_SOURCES = \
-	separator-dialog_glade.h
+	$(libseparator_built_sources)
+
+DISTCLEANFILES = \
+	$(libclock_built_sources)

 separator-dialog_glade.h: separator-dialog.glade
 	exo-csource --static --strip-comments --strip-content --name=separator_dialog_glade $< >$@
@ -60,7 +62,7 @@ endif
 desktopdir = $(datadir)/xfce4/panel-plugins
 desktop_in_in_files = separator.desktop.in.in
 desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-%.desktop.in: %.desktop.in.in
+separator.desktop.in: $(desktop_in_in_files)
 	sed -e "s,\@libdir\@,$(libdir),g" < $< > $@
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
--- a/plugins/showdesktop/Makefile.am
+++ b/plugins/showdesktop/Makefile.am
@ -45,7 +45,7 @@ libshowdesktop_la_DEPENDENCIES = \
 desktopdir = $(datadir)/xfce4/panel-plugins
 desktop_in_in_files = showdesktop.desktop.in.in
 desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-%.desktop.in: %.desktop.in.in
+showdesktop.desktop.in: $(desktop_in_in_files)
 	sed -e "s,\@libdir\@,$(libdir),g" < $< > $@
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
--- a/plugins/systray/Makefile.am
+++ b/plugins/systray/Makefile.am
@ -56,7 +56,7 @@ libsystray_la_DEPENDENCIES = \
 desktopdir = $(datadir)/xfce4/panel-plugins
 desktop_in_in_files = systray.desktop.in.in
 desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-%.desktop.in: %.desktop.in.in
+systray.desktop.in: $(desktop_in_in_files)
 	sed -e "s,\@libdir\@,$(libdir),g" < $< > $@
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
--- a/plugins/tasklist/Makefile.am
+++ b/plugins/tasklist/Makefile.am
@ -13,11 +13,14 @@ plugindir = \
 plugin_LTLIBRARIES = \
 	libtasklist.la

+libtasklist_built_sources = \
+	tasklist-dialog_glade.h
+
 libtasklist_la_SOURCES = \
+	$(libtasklist_built_sources) \
 	tasklist.c \
 	tasklist-widget.c \
-	tasklist-widget.h \
-	tasklist-dialog_glade.h
+	tasklist-widget.h

 libtasklist_la_CFLAGS = \
 	$(GTK_CFLAGS) \
@ -48,7 +51,10 @@ libtasklist_la_DEPENDENCIES = \

 if MAINTAINER_MODE
 BUILT_SOURCES = \
-	tasklist-dialog_glade.h
+	$(libtasklist_built_sources)
+
+DISTCLEANFILES = \
+	$(libclock_built_sources)

 tasklist-dialog_glade.h: tasklist-dialog.glade
 	exo-csource --static --strip-comments --strip-content --name=tasklist_dialog_glade $< >$@
@ -60,7 +66,7 @@ endif
 desktopdir = $(datadir)/xfce4/panel-plugins
 desktop_in_in_files = tasklist.desktop.in.in
 desktop_in_files =  $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-%.desktop.in: %.desktop.in.in
+tasklist.desktop.in: $(desktop_in_in_files)
 	sed -e "s,\@libdir\@,$(libdir),g" < $< > $@
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@