From bc12cb87301816f0649bb40f0eae1e50b5c0a5c4 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Wed, 30 Jul 2008 12:39:30 +0200 Subject: [PATCH] Fix even some more bits of autofoo. --- configure.ac | 1 + src/Makefile.am | 2 +- test/clients/Makefile.am | 6 +++++ test/server-app/Makefile | 64 +++++++++++++++++++++++++++++------------------- 4 files changed, 47 insertions(+), 26 deletions(-) diff --git a/configure.ac b/configure.ac index 31c1194..b453076 100644 --- a/configure.ac +++ b/configure.ac @@ -129,5 +129,6 @@ libmmanager-gtk/libmmanager-gtk.pc libmmanager-gtk/Makefile test/Makefile test/clients/Makefile +test/server-app/Makefile po/Makefile.in ]) diff --git a/src/Makefile.am b/src/Makefile.am index fa8b154..75c89ef 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,7 +9,7 @@ AM_CFLAGS = \ -g INCLUDES = \ - -DMMEDIAMANAGER_EXTENSIONDIR=\""($libdir)/mmediamanager/extensions"\" + -DMMEDIAMANAGER_EXTENSIONDIR=\""$(libdir)/mmediamanager/extensions"\" bin_PROGRAMS = \ mm-dbus-manager diff --git a/test/clients/Makefile.am b/test/clients/Makefile.am index 3c11254..bf070aa 100644 --- a/test/clients/Makefile.am +++ b/test/clients/Makefile.am @@ -46,6 +46,12 @@ mm_test_dbus_register_CFLAGS = \ mm_test_dbus_spawn_SOURCES = \ test-dbus-spawn.c +mm_test_dbus_spawn_CFLAGS = \ + $(MMEDIAMANAGER_CFLAGS) + +mm_test_dbus_spawn_LDADD = \ + $(MMEDIAMANAGER_LIBS) + mm_test_gtk_SOURCES = \ test-gtk.c diff --git a/test/server-app/Makefile b/test/server-app/Makefile index cf1a553..91c0051 100644 --- a/test/server-app/Makefile +++ b/test/server-app/Makefile @@ -35,7 +35,11 @@ host_triplet = i686-pc-linux-gnu subdir = test/server-app DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -76,6 +80,7 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = ${SHELL} /home/anarki/Sources/mmediamanager/missing --run aclocal-1.10 +ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} ALL_LINGUAS = AMTAR = ${SHELL} /home/anarki/Sources/mmediamanager/missing --run tar AR = ar @@ -90,10 +95,6 @@ CCDEPMODE = depmode=gcc3 CFLAGS = -g -O2 CPP = gcc -E CPPFLAGS = -CXX = g++ -CXXCPP = g++ -E -CXXDEPMODE = depmode=gcc3 -CXXFLAGS = -g -O2 CYGPATH_W = echo DATADIRNAME = share DBUS_BINDING_TOOL = /usr/bin/dbus-binding-tool @@ -101,20 +102,25 @@ DBUS_CFLAGS = -pthread -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/us DBUS_LIBS = -pthread -L//lib -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0 DEFS = -DHAVE_CONFIG_H DEPDIR = .deps +DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper +DOC_USER_FORMATS = DSYMUTIL = -ECHO = echo +DUMPBIN = ECHO_C = ECHO_N = -n ECHO_T = EGREP = /bin/grep -E EXEEXT = -F77 = -FFLAGS = +FGREP = /bin/grep -F GETTEXT_PACKAGE = mmediamanager GLIB_MKENUMS = /usr/bin/glib-mkenums GMOFILES = GMSGFMT = /usr/bin/msgfmt GREP = /bin/grep +GTKDOC_CHECK = /usr/bin/gtkdoc-check +GTK_CFLAGS = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/pixman-1 +GTK_LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lgio-2.0 -lcairo -lpango-1.0 -lfreetype -lz -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 +HELP_DIR = ${datadir}/gnome/help HTML_DIR = ${datadir}/gtk-doc/html INSTALL = /usr/bin/install -c INSTALL_DATA = ${INSTALL} -m 644 @@ -146,25 +152,31 @@ INTLTOOL_UPDATE = /usr/bin/intltool-update INTLTOOL_XAM_RULE = %.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ INTLTOOL_XML_NOMERGE_RULE = %.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@ INTLTOOL_XML_RULE = %.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ +LD = /usr/bin/ld LDFLAGS = LIBOBJS = LIBS = LIBTOOL = $(SHELL) $(top_builddir)/libtool +LIPO = LN_S = ln -s LTLIBOBJS = MAINT = MAKEINFO = ${SHELL} /home/anarki/Sources/mmediamanager/missing --run makeinfo MKDIR_P = /usr/bin/mkdir -p MKINSTALLDIRS = ./mkinstalldirs -MMEDIAMANAGER_CFLAGS = -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gio-unix-2.0/ -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -MMEDIAMANAGER_LIBS = -pthread -Wl,--export-dynamic -L//lib -lgthread-2.0 -lrt -lgio-2.0 -lgmodule-2.0 -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0 +MMEDIAMANAGER_CFLAGS = -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gio-unix-2.0/ -I/usr/include/libxml2 +MMEDIAMANAGER_LIBS = -pthread -Wl,--export-dynamic -lgthread-2.0 -lrt -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lxml2 MSGFMT = /usr/bin/msgfmt MSGFMT_OPTS = -c MSGMERGE = /usr/bin/msgmerge +NM = /usr/bin/nm -B NMEDIT = OBJEXT = o +OMF_DIR = ${datadir}/omf +OTOOL = +OTOOL64 = PACKAGE = mmediamanager -PACKAGE_BUGREPORT = +PACKAGE_BUGREPORT = http://repo.or.cz/w/mmediamanager.git PACKAGE_NAME = mmediamanager PACKAGE_STRING = mmediamanager 0.1.0 PACKAGE_TARNAME = mmediamanager @@ -188,13 +200,12 @@ abs_srcdir = /home/anarki/Sources/mmediamanager/test/server-app abs_top_builddir = /home/anarki/Sources/mmediamanager abs_top_srcdir = /home/anarki/Sources/mmediamanager ac_ct_CC = gcc -ac_ct_CXX = g++ -ac_ct_F77 = +ac_ct_DUMPBIN = am__include = include am__leading_dot = . am__quote = -am__tar = ${AMTAR} chof - "$$tardir" -am__untar = ${AMTAR} xf - +am__tar = tar --format=ustar -chf - "$$tardir" +am__untar = tar -xf - bindir = ${exec_prefix}/bin build = i686-pc-linux-gnu build_alias = @@ -220,6 +231,7 @@ libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale localstatedir = ${prefix}/var +lt_ECHO = echo mandir = ${datarootdir}/man mkdir_p = /usr/bin/mkdir -p oldincludedir = /usr/include @@ -234,20 +246,22 @@ sysconfdir = ${prefix}/etc target_alias = top_builddir = ../.. top_srcdir = ../.. -AM_CPPFLAGS = \ - -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ - -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ - -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ - $(MMEDIAMANAGER_CFLAGS) - AM_CFLAGS = \ -Werror \ -Wall \ - -g \ - $(MMEDIAMANAGER_CFLAGS) + -g mmanager_extensiondir = "`pkg-config --variable extensiondir libmmanager`" mmanager_extension_LTLIBRARIES = libmmanager-server.la +LDADD = \ + $(top_builddir)/src/libmmanager.la \ + $(MMEDIAMANAGER_LIBS) + +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/src \ + $(MMEDIAMANAGER_CFLAGS) + libmmanager_server_la_SOURCES = \ server-module.c \ server-app.h \ @@ -274,9 +288,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/server-app/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/server-app/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu test/server-app/Makefile + $(AUTOMAKE) --foreign test/server-app/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ -- 2.11.4.GIT