added vps
[util-vserver.git] / util-vserver / src / Makefile-files
index cfc1a2b..d6c4dab 100644 (file)
@@ -22,7 +22,6 @@ src_pkglib_CXX_X_PROGS        =  src/vunify src/vbuild src/vcheck
 
 src_OPTIONS_EXEMPT     =  src/parserpmdump \
                           src/readlink \
-                          src/showattr \
                           src/showperm \
                           src/vbuild \
                           src/vcheck \
@@ -46,25 +45,31 @@ src_OPTIONS_EXEMPT  =  src/parserpmdump \
 
 
 
-src_DIETPROGS          =  src/new-namespace \
-                          src/secure-mount \
-                          src/save_ctxinfo \
-                          src/mask2prefix \
-                          src/chroot-cat \
-                          src/chroot-rm \
-                          src/exec-cd \
-                          src/fakerunlevel \
-                          src/pipe-sync \
-                          src/exec-ulimit \
-                          src/vlimit \
-                          src/vunify \
-                          src/rpm-fake-resolver \
-                          src/vkill \
-                          src/vserver-stat
+src_DIETPROGS =                src/new-namespace \
+                       src/secure-mount \
+                       src/save_ctxinfo \
+                       src/mask2prefix \
+                       src/chroot-cat \
+                       src/chroot-rm \
+                       src/exec-cd \
+                       src/fakerunlevel \
+                       src/pipe-sync \
+                       src/exec-ulimit \
+                       src/vps \
+                       src/lsxid \
+                       src/chxid \
+                       src/showattr \
+                       src/setattr \
+                       src/vlimit \
+                       src/vunify \
+                       src/rpm-fake-resolver \
+                       src/vkill \
+                       src/vserver-stat \
+                       src/vserver-info
 
 src_HDRS =             src/vutil.h src/vutil.p src/util.h \
                        src/wrappers.h src/wrappers-vserver.h \
-                       src/ext2fs.h \
+                       src/fstool.h \
                        src/compat-pivot_root.h \
                        src/stack-start.h \
                        src/vunify-matchlist.h \
@@ -72,7 +77,7 @@ src_HDRS =            src/vutil.h src/vutil.p src/util.h \
                        src/wrappers-dirent.h \
                        src/vserver.hh
 
-src_pkglib_SCRPTS      =  src/setattr
+src_pkglib_SCRPTS =
 src_pkglib_PRGS                =  src/capchroot \
                           src/chroot-cat \
                           src/chroot-rm \
@@ -82,7 +87,6 @@ src_pkglib_PRGS               =  src/capchroot \
                           src/listdevip \
                           src/parserpmdump \
                           src/readlink \
-                          src/showattr \
                           src/showperm \
                           src/vreboot \
                           src/save_ctxinfo \
@@ -96,17 +100,24 @@ src_pkglib_PRGS            =  src/capchroot \
 src_pkglib_LTLIBS      =  src/rpm-fake.la
 src_lib_LTLIBS         =
 
-src_sbin_PRGS          =  src/chbind \
-                          src/chcontext \
-                          src/exec-cd \
-                          src/rebootmgr \
-                          src/reducecap \
-                          src/vdu \
-                          src/new-namespace \
-                          src/vlimit \
-                          src/vkill \
-                          src/vserver-stat \
-                          $(src_sbin_CXX_PROGS)
+src_sbin_SCRPTS =
+src_sbin_PRGS =                src/chbind \
+                       src/chcontext \
+                       src/exec-cd \
+                       src/lsxid \
+                       src/chxid \
+                       src/vps \
+                       src/showattr \
+                       src/setattr \
+                       src/rebootmgr \
+                       src/reducecap \
+                       src/vdu \
+                       src/new-namespace \
+                       src/vlimit \
+                       src/vkill \
+                       src/vserver-stat \
+                       src/vserver-info \
+                       $(src_sbin_CXX_PROGS)
 
 src_capchroot_SOURCES          =  src/capchroot.c
 src_capchroot_LDADD            =  lib/libvserver.la
@@ -150,8 +161,6 @@ src_save_ctxinfo_SOURCES    =  src/save_ctxinfo.c
 src_save_ctxinfo_LDADD         =  lib/libvserver.la
 src_save_ctxinfo_LDFLAGS       =  $(VSERVER_LDFLAGS)
 
-src_showattr_SOURCES           =  src/showattr.c
-src_showperm_SOURCES           =  src/showperm.c
 src_vdu_SOURCES                        =  src/vdu.c
 src_vreboot_SOURCES            =  src/vreboot.c
 src_new_namespace_SOURCES      =  src/new-namespace.c
@@ -163,6 +172,14 @@ src_rpm_fake_resolver_LDFLAGS      =  $(VSERVER_LDFLAGS)
 
 src_mask2prefix_SOURCES                =  src/mask2prefix.c
 
+src_vps_SOURCES                        =  src/vps.c src/util-exitlikeprocess.c
+src_vps_LDADD                  =  lib/libvserver.la
+src_vps_LDFLAGS                        =  $(VSERVER_LDFLAGS)
+
+src_vserver_info_SOURCES       =  src/vserver-info.c
+src_vserver_info_LDADD         =  lib/libvserver.la
+src_vserver_info_LDFLAGS       =  $(VSERVER_LDFLAGS)
+
 src_vserver_stat_SOURCES       =  src/vserver-stat.c
 src_vserver_stat_LDADD         =  lib/libvserver.la
 src_vserver_stat_LDFLAGS       =  $(VSERVER_LDFLAGS)
@@ -171,6 +188,23 @@ src_vfiles_SOURCES         =  src/vfiles.cc src/vutil.cc src/vserver.cc
 src_vbuild_SOURCES             =  src/vbuild.cc src/vutil.cc src/vserver.cc
 src_vcheck_SOURCES             =  src/vcheck.cc src/vutil.cc src/vserver.cc
 
+src_lsxid_SOURCES              =  src/fstool.c src/util-safechdir.c src/lsxid.c
+src_lsxid_LDADD                        =  lib/libvserver.la
+src_lsxid_LDFLAGS              =  $(VSERVER_LDFLAGS)
+
+src_chxid_SOURCES              =  src/fstool.c src/util-safechdir.c \
+                                  src/fstool-resolvectx.c src/chxid.c
+src_chxid_LDADD                        =  lib/libvserver.la
+src_chxid_LDFLAGS              =  $(VSERVER_LDFLAGS)
+
+src_showattr_SOURCES           =  src/fstool.c src/util-safechdir.c src/showattr.c
+src_showattr_LDADD             =  lib/libvserver.la
+src_showattr_LDFLAGS           =  $(VSERVER_LDFLAGS)
+
+src_setattr_SOURCES            =  src/fstool.c src/util-safechdir.c src/setattr.c
+src_setattr_LDADD              =  lib/libvserver.la
+src_setattr_LDFLAGS            =  $(VSERVER_LDFLAGS)
+
 
 src_vunify_SOURCES             =  src/vunify.c \
                                   src/util-safechdir.c \
@@ -199,10 +233,6 @@ src_sbin__PROGS                    =
 src_pkglib_CXX_PROGS           =  
 endif
 
-src/setattr$(EXEEXT):          src/showattr$(EXEEXT)
-                               @rm -f '$@'
-                               ln -s showattr$(EXEEXT) '$@'
-
 install-exec-hook:             src_install_exec_hook
 
 src_install_exec_hook: