Author: lslezak Date: Wed Jul 16 16:41:03 2008 New Revision: 49184 URL: http://svn.opensuse.org/viewcvs/yast?rev=49184&view=rev Log: - compile fixes Modified: branches/tmp/lslezak/workshop/core/dbus/SCR_service/Makefile.am branches/tmp/lslezak/workshop/core/libscr/src/Makefile.am branches/tmp/lslezak/workshop/core/libscr/testsuite/Makefile.am Modified: branches/tmp/lslezak/workshop/core/dbus/SCR_service/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/workshop/core/dbus/SCR_service/Makefile.am?rev=49184&r1=49183&r2=49184&view=diff ============================================================================== --- branches/tmp/lslezak/workshop/core/dbus/SCR_service/Makefile.am (original) +++ branches/tmp/lslezak/workshop/core/dbus/SCR_service/Makefile.am Wed Jul 16 16:41:03 2008 @@ -10,9 +10,9 @@ SCR_dbus_server_SOURCES = SCR_dbus_server.cc DBusServer.cc DBusServer.h -SCR_dbus_server_CPPFLAGS = $(AM_CPPFLAGS) $(DBUS_CFLAGS) $(POLKIT_CFLAGS) -I$(srcdir)/../liby2dbus -I$(srcdir)/../../scr/src -I$(top_builddir)/libscr/src/include +SCR_dbus_server_CPPFLAGS = $(AM_CPPFLAGS) $(DBUS_CFLAGS) $(POLKIT_CFLAGS) -I$(top_builddir)/liby2dbus/src -I$(srcdir)/../../scr/src -I$(top_builddir)/libscr/src/include -SCR_dbus_server_LDADD = ${AGENT_LIBADD} $(srcdir)/../liby2dbus/liby2dbus.la $(DBUS_LIBS) $(POLKIT_LIBS) $(top_builddir)/scr/src/libpy2scr.la +SCR_dbus_server_LDADD = ${AGENT_LIBADD} $(top_builddir)/liby2dbus/src/liby2dbus.la $(top_builddir)/scr/src/libpy2scr.la # service activation config Modified: branches/tmp/lslezak/workshop/core/libscr/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/workshop/core/libscr/src/Makefile.am?rev=49184&r1=49183&r2=49184&view=diff ============================================================================== --- branches/tmp/lslezak/workshop/core/libscr/src/Makefile.am (original) +++ branches/tmp/lslezak/workshop/core/libscr/src/Makefile.am Wed Jul 16 16:41:03 2008 @@ -13,12 +13,12 @@ libscr_la_CPPFLAGS = $(DBUS_CFLAGS) -libscr_la_LIBADD = $(srcdir)/../../dbus/liby2dbus/liby2dbus.la +libscr_la_LIBADD = $(srcdir)/../../liby2dbus/src/liby2dbus.la INCLUDES = \ -I$(srcdir)/../../libycp/src/include \ -I$(srcdir)/../../liby2/src/include \ - -I$(srcdir)/../../dbus/liby2dbus \ + -I$(srcdir)/../../liby2dbus/src \ -I$(srcdir)/../../scr/src \ -I$(srcdir)/include \ ${Y2UTIL_CFLAGS} Modified: branches/tmp/lslezak/workshop/core/libscr/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/workshop/core/libscr/testsuite/Makefile.am?rev=49184&r1=49183&r2=49184&view=diff ============================================================================== --- branches/tmp/lslezak/workshop/core/libscr/testsuite/Makefile.am (original) +++ branches/tmp/lslezak/workshop/core/libscr/testsuite/Makefile.am Wed Jul 16 16:41:03 2008 @@ -13,7 +13,7 @@ noinst_PROGRAMS = runscr runscr_SOURCES = runscr.cc -runscr_LDADD = ../src/libscr.la ../../liby2/src/liby2.la ../../libycp/src/libycp.la ${Y2UTIL_LIBS} ../../dbus/liby2dbus/liby2dbus.la +runscr_LDADD = ../src/libscr.la ../../liby2/src/liby2.la ../../libycp/src/libycp.la ${Y2UTIL_LIBS} ../../liby2dbus/src/liby2dbus.la PACKAGE = libscr AUTOMAKE_OPTIONS = dejagnu -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org