Author: lslezak
Date: Mon Jul 27 13:37:29 2009
New Revision: 58157
URL: http://svn.opensuse.org/viewcvs/yast?rev=58157&view=rev
Log:
- compile/link fixes
Modified:
branches/tmp/lslezak/dbus-server/configure.in.in
branches/tmp/lslezak/dbus-server/src/liby2dbus/src/Makefile.am
branches/tmp/lslezak/dbus-server/src/services/SCR_service/DBusServer.cc
branches/tmp/lslezak/dbus-server/src/services/SCR_service/Makefile.am
branches/tmp/lslezak/dbus-server/src/services/namespace_service/src/DBusModulesServer.cc
branches/tmp/lslezak/dbus-server/src/services/namespace_service/src/Makefile.am
branches/tmp/lslezak/dbus-server/src/services/namespace_service/testsuite/modules/Makefile.am
Modified: branches/tmp/lslezak/dbus-server/configure.in.in
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/dbus-server/configure.in.in?rev=58157&r1=58156&r2=58157&view=diff
==============================================================================
--- branches/tmp/lslezak/dbus-server/configure.in.in (original)
+++ branches/tmp/lslezak/dbus-server/configure.in.in Mon Jul 27 13:37:29 2009
@@ -80,4 +80,16 @@
AM_CONDITIONAL([HAVE_POLKIT], [test "x$HAVE_POLKIT" = x1])
## and generate the output
+AC_CONFIG_FILES([
+ src/services/namespace_service/src/yast_dbus_names.h
+ src/services/namespace_service/src/org.opensuse.yast.module-manager.policy
+ src/services/namespace_service/src/org.opensuse.YaST.modules.conf
+ src/services/namespace_service/src/org.opensuse.YaST.modules.service.in
+ src/services/SCR_service/org.opensuse.yast.SCR.conf
+ src/services/SCR_service/org.opensuse.yast.SCR.service.in
+ src/services/SCR_service/scr_names.h
+ src/services/SCR_service/test_SCR_dbus_server.rb
+])
+
+## and generate the output
@YAST2-OUTPUT@
Modified: branches/tmp/lslezak/dbus-server/src/liby2dbus/src/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/dbus-server/src/liby2dbus/src/Makefile.am?rev=58157&r1=58156&r2=58157&view=diff
==============================================================================
--- branches/tmp/lslezak/dbus-server/src/liby2dbus/src/Makefile.am (original)
+++ branches/tmp/lslezak/dbus-server/src/liby2dbus/src/Makefile.am Mon Jul 27 13:37:29 2009
@@ -4,7 +4,6 @@
AM_CXXFLAGS = -DY2LOG=\"y2dbus\" -DSUSEVERSION=\"${SUSEVERSION}\"
-
plugin_LTLIBRARIES = liby2dbus.la
liby2dbus_la_SOURCES = DBusMsg.cc DBusMsg.h DBusConn.cc DBusConn.h DBusCaller.cc DBusCaller.h \
@@ -14,11 +13,11 @@
liby2dbus_la_SOURCES += PolKit.cc PolKit.h
endif
-liby2dbus_la_CPPFLAGS = $(DBUS_CFLAGS) $(POLKIT_CFLAGS)
+liby2dbus_la_CPPFLAGS = $(DBUS_CFLAGS) $(POLKIT_CFLAGS) -I$(includedir)
liby2dbus_la_LIBADD = $(DBUS_LIBS) $(POLKIT_LIBS)
liby2dbus_la_LDFLAGS = -version-info 2:0
-INCLUDES = ${AGENT_INCLUDES}
+INCLUDES = ${AGENT_INCLUDES} -I$(includedir)
Modified: branches/tmp/lslezak/dbus-server/src/services/SCR_service/DBusServer.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/dbus-server/src/services/SCR_service/DBusServer.cc?rev=58157&r1=58156&r2=58157&view=diff
==============================================================================
--- branches/tmp/lslezak/dbus-server/src/services/SCR_service/DBusServer.cc (original)
+++ branches/tmp/lslezak/dbus-server/src/services/SCR_service/DBusServer.cc Mon Jul 27 13:37:29 2009
@@ -5,7 +5,7 @@
*/
-#include "ScriptingAgent.h"
+#include
#include "DBusServer.h"
#include "DBusMsg.h"
Modified: branches/tmp/lslezak/dbus-server/src/services/SCR_service/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/dbus-server/src/services/SCR_service/Makefile.am?rev=58157&r1=58156&r2=58157&view=diff
==============================================================================
--- branches/tmp/lslezak/dbus-server/src/services/SCR_service/Makefile.am (original)
+++ branches/tmp/lslezak/dbus-server/src/services/SCR_service/Makefile.am Mon Jul 27 13:37:29 2009
@@ -10,15 +10,15 @@
AM_CXXFLAGS = -DY2LOG=\"SCR-service\" -DSUSEVERSION=\"${SUSEVERSION}\"
-INCLUDES = ${AGENT_INCLUDES}
+INCLUDES = ${AGENT_INCLUDES} -I$(includedir)
ybin_PROGRAMS = SCR_dbus_server
SCR_dbus_server_SOURCES = SCR_dbus_server.cc DBusServer.cc DBusServer.h
-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_CPPFLAGS = $(AM_CPPFLAGS) $(DBUS_CFLAGS) $(POLKIT_CFLAGS) -I$(top_builddir)/src/liby2dbus/src
-SCR_dbus_server_LDADD = ${AGENT_LIBADD} $(top_builddir)/liby2dbus/src/liby2dbus.la $(top_builddir)/scr/src/libpy2scr.la
+SCR_dbus_server_LDADD = ${AGENT_LIBADD} $(top_builddir)/src/liby2dbus/src/liby2dbus.la -lycp -ly2 -ly2util ${libdir}/YaST2/plugin/libpy2scr.la
# PolicyKit defaults
polkit_policiesdir = `pkg-config --print-errors --variable policydir polkit`
Modified: branches/tmp/lslezak/dbus-server/src/services/namespace_service/src/DBusModulesServer.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/dbus-server/src/services/namespace_service/src/DBusModulesServer.cc?rev=58157&r1=58156&r2=58157&view=diff
==============================================================================
--- branches/tmp/lslezak/dbus-server/src/services/namespace_service/src/DBusModulesServer.cc (original)
+++ branches/tmp/lslezak/dbus-server/src/services/namespace_service/src/DBusModulesServer.cc Mon Jul 27 13:37:29 2009
@@ -18,7 +18,7 @@
#include <functional>
-#include
+#include
#include "yast_dbus_names.h"
Modified: branches/tmp/lslezak/dbus-server/src/services/namespace_service/src/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/dbus-server/src/services/namespace_service/src/Makefile.am?rev=58157&r1=58156&r2=58157&view=diff
==============================================================================
--- branches/tmp/lslezak/dbus-server/src/services/namespace_service/src/Makefile.am (original)
+++ branches/tmp/lslezak/dbus-server/src/services/namespace_service/src/Makefile.am Mon Jul 27 13:37:29 2009
@@ -7,15 +7,17 @@
AM_CXXFLAGS = -DY2LOG=\"DBus-service\" -DSUSEVERSION=\"${SUSEVERSION}\"
-INCLUDES = ${AGENT_INCLUDES}
+INCLUDES = ${AGENT_INCLUDES} -I$(includedir)
+
+AM_LDFLAGS = -L${libdir}
ybin_PROGRAMS = yast_modules_dbus_server
yast_modules_dbus_server_SOURCES = yast_modules_dbus_server.cc DBusModulesServer.cc DBusModulesServer.h
-yast_modules_dbus_server_CPPFLAGS = $(AM_CPPFLAGS) $(DBUS_CFLAGS) $(POLKIT_CFLAGS) -I$(top_builddir)/liby2dbus/src -I$(srcdir)/../../scr/src -I$(top_builddir)/libscr/src/include -I$(top_builddir)/wfm/src
+yast_modules_dbus_server_CPPFLAGS = $(AM_CPPFLAGS) $(DBUS_CFLAGS) $(POLKIT_CFLAGS) -I$(top_builddir)/src/liby2dbus/src -I$(includedir)
-yast_modules_dbus_server_LDADD = ${AGENT_LIBADD} $(top_builddir)/liby2dbus/src/liby2dbus.la $(top_builddir)/scr/src/libpy2scr.la $(top_builddir)/wfm/src/libpy2wfm.la
+yast_modules_dbus_server_LDADD = ${AGENT_LIBADD} $(top_builddir)/src/liby2dbus/src/liby2dbus.la -lycp -ly2 -ly2util ${libdir}/YaST2/plugin/libpy2wfm.la
# PolicyKit defaults
polkit_policiesdir = `pkg-config --print-errors --variable policydir polkit`
Modified: branches/tmp/lslezak/dbus-server/src/services/namespace_service/testsuite/modules/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/dbus-server/src/services/namespace_service/testsuite/modules/Makefile.am?rev=58157&r1=58156&r2=58157&view=diff
==============================================================================
--- branches/tmp/lslezak/dbus-server/src/services/namespace_service/testsuite/modules/Makefile.am (original)
+++ branches/tmp/lslezak/dbus-server/src/services/namespace_service/testsuite/modules/Makefile.am Mon Jul 27 13:37:29 2009
@@ -6,7 +6,7 @@
yast_modules_ybc = $(yast_modules:.ycp=.ybc)
$(yast_modules_ybc): $(yast_modules)
- ../../../../base/tools/ycpc/ycpc -c $<
+ ycpc -c $<
all: $(yast_modules_ybc)
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
