Author: aschnell Date: Tue Jun 2 15:40:33 2009 New Revision: 57395 URL: http://svn.opensuse.org/viewcvs/yast?rev=57395&view=rev Log: - work work on libstorage split off Modified: trunk/storage/libstorage/bindings/ycp/LibStorage.i trunk/storage/libstorage/bindings/ycp/Makefile.am trunk/storage/libstorage/src/Makefile.am trunk/storage/yast2-storage.spec.in Modified: trunk/storage/libstorage/bindings/ycp/LibStorage.i URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/bindings/ycp/L... ============================================================================== --- trunk/storage/libstorage/bindings/ycp/LibStorage.i (original) +++ trunk/storage/libstorage/bindings/ycp/LibStorage.i Tue Jun 2 15:40:33 2009 @@ -7,9 +7,9 @@ %include "LiMaL.i" %{ -#include "../../src/StorageInterface.h" -#include "../../src/HumanString.h" -#include "../../src/Graph.h" +#include <storage/StorageInterface.h> +#include <storage/HumanString.h> +#include <storage/Graph.h> %} using namespace std; @@ -41,7 +41,7 @@ specialize_sequence(storage::Environment, TO_PACK, FROM_PACK, CHECK) -%include "../../src/StorageInterface.h" -%include "../../src/HumanString.h" -%include "../../src/Graph.h" +%include </usr/include/storage/StorageInterface.h> +%include </usr/include/storage/HumanString.h> +%include </usr/include/storage/Graph.h> Modified: trunk/storage/libstorage/bindings/ycp/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/bindings/ycp/M... ============================================================================== --- trunk/storage/libstorage/bindings/ycp/Makefile.am (original) +++ trunk/storage/libstorage/bindings/ycp/Makefile.am Tue Jun 2 15:40:33 2009 @@ -3,11 +3,11 @@ # PLUGLIB_MODULE = LibStorage -PLUGLIB_LIBRARY = ../../src/.libs/libstorage.so +PLUGLIB_LIBRARY = /usr/lib/libstorage.so PLUGLIB_DEPEND = \ - ../../src/StorageInterface.h \ - ../../src/HumanString.h \ - ../../src/Graph.h + /usr/include/storage/StorageInterface.h \ + /usr/include/storage/HumanString.h \ + /usr/include/storage/Graph.h include $(top_srcdir)/pluglib-bindings.ami Modified: trunk/storage/libstorage/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Makefile.a... ============================================================================== --- trunk/storage/libstorage/src/Makefile.am (original) +++ trunk/storage/libstorage/src/Makefile.am Tue Jun 2 15:40:33 2009 @@ -2,7 +2,6 @@ # Makefile.am for libstorage/src # -AM_CXXFLAGS = INCLUDES = -I$(includedir) storage: @@ -27,13 +26,6 @@ StorageCallbacks.cc StorageCallbacks.h libpy2StorageCallbacks_la_LDFLAGS = -version-info 2:0 -libpy2StorageCallbacks_la_LIBADD = -L$(libdir) -ly2 -lycp libstorage.la - -pkgincludedir = $(includedir)/storage - -pkginclude_HEADERS = \ - StorageInterface.h \ - HumanString.h \ - Graph.h +libpy2StorageCallbacks_la_LIBADD = -L$(libdir) -ly2 -lycp -lstorage CLEANFILES = $(BUILT_SOURCES) Modified: trunk/storage/yast2-storage.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/yast2-storage.spec.in?rev... ============================================================================== --- trunk/storage/yast2-storage.spec.in (original) +++ trunk/storage/yast2-storage.spec.in Tue Jun 2 15:40:33 2009 @@ -38,9 +38,6 @@ @CLEAN@ -%post -%{fillup_only -n storage} - %files %defattr(-,root,root) @@ -61,7 +58,6 @@ @clientdir@/disk_worker.ycp @clientdir@/multipath-simple.ycp @moduledir@/* -@fillupdir@/sysconfig.storage %dir @ydatadir@ @ydatadir@/*.ycp @@ -97,5 +93,5 @@ %files devel %defattr(-,root,root) -@includedir@ +%doc @docdir@/autodocs %doc @docdir@/config.xml.description -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org