cleanups
[util-vserver.git] / util-vserver / src / Makefile-files
index 696a0c3..45352a1 100644 (file)
@@ -25,17 +25,13 @@ src_pkglib_C99_PROGS =      src/vunify src/vcopy
 
 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT += \
                        src/parserpmdump \
-                       src/readlink \
                        src/showperm \
                        src/vbuild \
                        src/vcheck \
                        src/vreboot \
                        src/save_ctxinfo \
                        src/mask2prefix \
-                       src/pipe-sync \
-                       src/capchroot \
                        src/chroot-cat \
-                       src/filetime \
                        src/ifspec \
                        src/rebootmgr \
                        src/vdu \
@@ -44,6 +40,10 @@ AM_INSTALLCHECK_STD_OPTIONS_EXEMPT += \
 
 
 DIETPROGS +=           src/chcontext-compat \
+                       src/capchroot \
+                       src/filetime \
+                       src/lockfile \
+                       src/readlink \
                        src/secure-mount \
                        src/save_ctxinfo \
                        src/mask2prefix \
@@ -54,7 +54,6 @@ DIETPROGS +=          src/chcontext-compat \
                        src/exec-cd \
                        src/fakerunlevel \
                        src/keep-ctx-alive \
-                       src/pipe-sync \
                        src/exec-ulimit \
                        src/vps \
                        src/lsxid \
@@ -72,6 +71,7 @@ DIETPROGS +=          src/chcontext-compat \
                        src/vcopy \
                        src/vkill \
                        src/vsched \
+                       src/vshelper-sync \
                        src/vrsetup \
                        src/vserver-stat \
                        src/vserver-info
@@ -96,22 +96,25 @@ pkglib_PROGRAMS +=  src/capchroot \
                        src/clearenv \
                        src/fakerunlevel \
                        src/filetime \
-                       src/ifspec \
                        src/keep-ctx-alive \
-                       src/listdevip \
-                       src/parserpmdump \
+                       src/lockfile \
                        src/readlink \
-                       src/showperm \
-                       src/vreboot \
                        src/save_ctxinfo \
                        src/secure-mount \
                        src/mask2prefix \
-                       src/pipe-sync \
                        src/exec-ulimit \
                        src/rpm-fake-resolver \
+                       src/vshelper-sync \
                        $(src_pkglib_C99_X_PROGS) \
                        $(src_pkglib_CXX_X_PROGS)
 
+legacy_PROGRAMS +=     src/ifspec \
+                       src/listdevip \
+                       src/parserpmdump \
+                       src/rebootmgr \
+                       src/showperm \
+                       src/vreboot
+
 pkglib_LTLIBRARIES +=  src/rpm-fake.la
 
 sbin_PROGRAMS +=       src/chbind \
@@ -121,7 +124,6 @@ sbin_PROGRAMS +=    src/chbind \
                        src/vps \
                        src/showattr \
                        src/setattr \
-                       src/rebootmgr \
                        src/reducecap \
                        src/vdu \
                        src/vattribute \
@@ -136,12 +138,13 @@ sbin_PROGRAMS +=  src/chbind \
                        src/vuname \
                        $(src_sbin_CXX_X_PROGS)
 
-src_capchroot_SOURCES          =  src/capchroot.c
-src_capchroot_LDADD            =  lib/libvserver.la
+src_capchroot_SOURCES =                src/capchroot.c
+src_capchroot_LDADD =          $(VSERVER_LDADDS)
+src_capchroot_LDFLAGS =                $(VSERVER_LDFLAGS)
 
-src_chbind_SOURCES             =  src/chbind.c
-src_chbind_LDADD               =  $(VSERVER_LDADDS)
-src_chbind_LDFLAGS             =  $(VSERVER_LDFLAGS)
+src_chbind_SOURCES =           src/chbind.c
+src_chbind_LDADD =             $(VSERVER_LDADDS)
+src_chbind_LDFLAGS =           $(VSERVER_LDFLAGS)
 
 src_chcontext_compat_SOURCES = src/chcontext.c
 src_chcontext_compat_LDADD =   $(VSERVER_LDADDS) lib_internal/libinternal.a
@@ -155,19 +158,23 @@ src_vsched_SOURCES                =  src/vsched.c
 src_vsched_LDADD               =  $(VSERVER_LDADDS)
 src_vsched_LDFLAGS             =  $(VSERVER_LDFLAGS)
 
+src_filetime_SOURCES           =  src/filetime.c
+src_filetime_LDADD             =  $(VSERVER_LDADDS)
+src_filetime_LDFLAGS           =  $(VSERVER_LDFLAGS)
+
 src_chroot_cat_SOURCES         =  src/chroot-cat.c
 src_chroot_rm_SOURCES          =  src/chroot-rm.c
 src_clearenv_SOURCES           =  src/clearenv.c
 src_exec_cd_SOURCES            =  src/exec-cd.c
 src_fakerunlevel_SOURCES       =  src/fakerunlevel.c
-src_filetime_SOURCES           =  src/filetime.c
 src_ifspec_SOURCES             =  src/ifspec.c
 src_listdevip_SOURCES          =  src/listdevip.c
+src_lockfile_SOURCES           =  src/lockfile.c
 src_parserpmdump_SOURCES       =  src/parserpmdump.c
 src_readlink_SOURCES           =  src/readlink.c
 src_rebootmgr_SOURCES          =  src/rebootmgr.c
-src_pipe_sync_SOURCES          =  src/pipe-sync.c
 src_exec_ulimit_SOURCES                =  src/exec-ulimit.c
+src_vshelper_sync_SOURCES      =  src/vshelper-sync.c
 
 src_reducecap_SOURCES          =  src/reducecap.c
 src_reducecap_LDADD            =  $(VSERVER_LDADDS)
@@ -205,15 +212,15 @@ src_rpm_fake_resolver_LDFLAGS     =  $(VSERVER_LDFLAGS)
 src_mask2prefix_SOURCES                =  src/mask2prefix.c
 
 src_vps_SOURCES                        =  src/vps.c
-src_vps_LDADD                  =  $(VSERVER_LDADDS) lib_internal/libinternal.a
+src_vps_LDADD                  =  lib_internal/libinternal.a $(VSERVER_LDADDS)
 src_vps_LDFLAGS                        =  $(VSERVER_LDFLAGS)
 
 src_vserver_info_SOURCES       =  src/vserver-info.c
-src_vserver_info_LDADD         =  $(VSERVER_LDADDS)
+src_vserver_info_LDADD         =  lib_internal/libinternal.a $(VSERVER_LDADDS)
 src_vserver_info_LDFLAGS       =  $(VSERVER_LDFLAGS)
 
 src_vserver_stat_SOURCES       =  src/vserver-stat.c
-src_vserver_stat_LDADD         =  $(VSERVER_LDADDS) libensc_vector.a
+src_vserver_stat_LDADD         =  lib_internal/libinternal.a $(VSERVER_LDADDS) libensc_vector.a
 src_vserver_stat_LDFLAGS       =  $(VSERVER_LDFLAGS)
 
 src_vfiles_SOURCES             =  src/vfiles.cc src/vutil.cc src/vserver.cc
@@ -285,8 +292,3 @@ src_install_exec_hook:
                                -rm -f $(DESTDIR)$(pkglibdir)/rpm-fake.a $(DESTDIR)$(pkglibdir)/rpm-fake.la
 
 include $(top_srcdir)/src/testsuite/Makefile-files
-
-## Local Variables:
-## compile-command: "make -C .. -k"
-## End:
-