proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-14 22:34:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Joined lxc and liblxc directories

Browse Source
This commit is contained in:
dlezcano 2008-09-04 08:14:59 +00:00
parent 0ad19a3fc3
commit 96f3e4ebd4
23 changed files with 53 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.in
View File

@ -24,7 +24,6 @@ AC_CONFIG_FILES([
lxc.spec lxc.spec
config/Makefile config/Makefile
src/Makefile src/Makefile
src/liblxc/Makefile
src/lxc/Makefile src/lxc/Makefile
src/lxc/lxc-ps src/lxc/lxc-ps
etc/Makefile etc/Makefile

2
lxc.spec.in
View File

@ -91,8 +91,6 @@ rm -rf %{buildroot}
%{_libdir}/*.a %{_libdir}/*.a
%post devel %post devel
ln -sf %{_includedir}/%{name} %{_includedir}/liblxc
%changelog %changelog
* Sun Aug 3 2008 Daniel Lezcano <dlezcano@fr.ibm.com> * Sun Aug 3 2008 Daniel Lezcano <dlezcano@fr.ibm.com>

2
src/Makefile.am
View File

@ -1 +1 @@
SUBDIRS = liblxc lxc SUBDIRS = lxc

36
src/lxc/Makefile.am
View File

@ -56,49 +56,37 @@ bin_PROGRAMS = \
lxc-priority lxc-priority
lxc_create_SOURCES = lxc_create.c lxc_config.c lxc_config.h lxc_create_SOURCES = lxc_create.c lxc_config.c lxc_config.h
lxc_create_LDADD = \ lxc_create_LDADD = liblxc.la
$(top_builddir)/src/lxc/liblxc.la
lxc_destroy_SOURCES = lxc_destroy.c lxc_destroy_SOURCES = lxc_destroy.c
lxc_destroy_LDADD = \ lxc_destroy_LDADD = liblxc.la
$(top_builddir)/src/lxc/liblxc.la
lxc_start_SOURCES = lxc_start.c lxc_start_SOURCES = lxc_start.c
lxc_start_LDADD = \ lxc_start_LDADD = liblxc.la
$(top_builddir)/src/lxc/liblxc.la
lxc_stop_SOURCES = lxc_stop.c lxc_stop_SOURCES = lxc_stop.c
lxc_stop_LDADD = \ lxc_stop_LDADD = liblxc.la
$(top_builddir)/src/lxc/liblxc.la
lxc_execute_SOURCES = lxc_execute.c lxc_execute_SOURCES = lxc_execute.c
lxc_execute_LDADD = \ lxc_execute_LDADD = liblxc.la
$(top_builddir)/src/lxc/liblxc.la
lxc_monitor_SOURCES = lxc_monitor.c lxc_monitor_SOURCES = lxc_monitor.c
lxc_monitor_LDADD = \ lxc_monitor_LDADD = liblxc.la
$(top_builddir)/src/lxc/liblxc.la
lxc_console_SOURCES = lxc_console.c lxc_console_SOURCES = lxc_console.c
lxc_console_LDADD = \ lxc_console_LDADD = liblxc.la
$(top_builddir)/src/lxc/liblxc.la
lxc_info_SOURCES = lxc_info.c lxc_info_SOURCES = lxc_info.c
lxc_info_LDADD = \ lxc_info_LDADD = liblxc.la
$(top_builddir)/src/lxc/liblxc.la
lxc_kill_SOURCES = lxc_kill.c lxc_kill_SOURCES = lxc_kill.c
lxc_kill_LDADD = \ lxc_kill_LDADD = liblxc.la
$(top_builddir)/src/lxc/liblxc.la
lxc_freeze_SOURCES = lxc_freeze.c lxc_freeze_SOURCES = lxc_freeze.c
lxc_freeze_LDADD = \ lxc_freeze_LDADD = liblxc.la
$(top_builddir)/src/lxc/liblxc.la
lxc_unfreeze_SOURCES = lxc_unfreeze.c lxc_unfreeze_SOURCES = lxc_unfreeze.c
lxc_unfreeze_LDADD = \ lxc_unfreeze_LDADD = liblxc.la
$(top_builddir)/src/lxc/liblxc.la
lxc_priority_SOURCES = lxc_priority.c lxc_priority_SOURCES = lxc_priority.c
lxc_priority_LDADD = \ lxc_priority_LDADD = liblxc.la
$(top_builddir)/src/lxc/liblxc.la

39
test/Makefile.am
View File

@ -1,4 +1,4 @@
INCLUDES= -I$(top_srcdir)/src/liblxc -I$(top_srcdir)/src INCLUDES= -I$(top_srcdir)/src
noinst_PROGRAMS = \ noinst_PROGRAMS = \
tst_list \ tst_list \
@ -21,76 +21,75 @@ noinst_PROGRAMS = \
lxc_low_monitor \ lxc_low_monitor \
lxc_state lxc_state
tst_list_SOURCES = tst_list.c tst_list_SOURCES = tst_list.c
tst_list_LDADD = \ tst_list_LDADD = \
$(top_builddir)/src/liblxc/liblxc.la $(top_builddir)/src/lxc/liblxc.la
confile_SOURCES = confile.c confile_SOURCES = confile.c
confile_LDADD = \ confile_LDADD = \
$(top_builddir)/src/lxc/lxc_config.o \ $(top_builddir)/src/lxc/lxc_config.o \
$(top_builddir)/src/liblxc/liblxc.la $(top_builddir)/src/lxc/liblxc.la
conf_SOURCES = conf.c conf_SOURCES = conf.c
conf_LDADD = \ conf_LDADD = \
$(top_builddir)/src/liblxc/liblxc.la $(top_builddir)/src/lxc/liblxc.la
movedev_SOURCES = movedev.c movedev_SOURCES = movedev.c
movedev_LDADD = \ movedev_LDADD = \
$(top_builddir)/src/liblxc/liblxc.la $(top_builddir)/src/lxc/liblxc.la
dev_SOURCES = dev.c dev_SOURCES = dev.c
dev_LDADD = \ dev_LDADD = \
$(top_builddir)/src/liblxc/liblxc.la $(top_builddir)/src/lxc/liblxc.la
forward_SOURCES = forward.c forward_SOURCES = forward.c
forward_LDADD = \ forward_LDADD = \
$(top_builddir)/src/liblxc/liblxc.la $(top_builddir)/src/lxc/liblxc.la
proxy_SOURCES = proxy.c proxy_SOURCES = proxy.c
proxy_LDADD = \ proxy_LDADD = \
$(top_builddir)/src/liblxc/liblxc.la $(top_builddir)/src/lxc/liblxc.la
veth_SOURCES = veth.c veth_SOURCES = veth.c
veth_LDADD = \ veth_LDADD = \
$(top_builddir)/src/liblxc/liblxc.la $(top_builddir)/src/lxc/liblxc.la
macvlan_SOURCES = macvlan.c macvlan_SOURCES = macvlan.c
macvlan_LDADD = \ macvlan_LDADD = \
$(top_builddir)/src/liblxc/liblxc.la $(top_builddir)/src/lxc/liblxc.la
ipv4_add_SOURCES = ipv4_add.c ipv4_add_SOURCES = ipv4_add.c
ipv4_add_LDADD = \ ipv4_add_LDADD = \
$(top_builddir)/src/liblxc/liblxc.la $(top_builddir)/src/lxc/liblxc.la
ipv6_add_SOURCES = ipv6_add.c ipv6_add_SOURCES = ipv6_add.c
ipv6_add_LDADD = \ ipv6_add_LDADD = \
$(top_builddir)/src/liblxc/liblxc.la $(top_builddir)/src/lxc/liblxc.la
lxc_create_SOURCES = lxc_create.c lxc_create_SOURCES = lxc_create.c
lxc_create_LDADD = \ lxc_create_LDADD = \
$(top_builddir)/src/liblxc/liblxc.la $(top_builddir)/src/lxc/liblxc.la
lxc_destroy_SOURCES = lxc_destroy.c lxc_destroy_SOURCES = lxc_destroy.c
lxc_destroy_LDADD = \ lxc_destroy_LDADD = \
$(top_builddir)/src/liblxc/liblxc.la $(top_builddir)/src/lxc/liblxc.la
lxc_start_SOURCES = lxc_start.c lxc_start_SOURCES = lxc_start.c
lxc_start_LDADD = \ lxc_start_LDADD = \
$(top_builddir)/src/liblxc/liblxc.la $(top_builddir)/src/lxc/liblxc.la
lxc_stop_SOURCES = lxc_stop.c lxc_stop_SOURCES = lxc_stop.c
lxc_stop_LDADD = \ lxc_stop_LDADD = \
$(top_builddir)/src/liblxc/liblxc.la $(top_builddir)/src/lxc/liblxc.la
lxc_monitor_SOURCES = lxc_monitor.c lxc_monitor_SOURCES = lxc_monitor.c
lxc_monitor_LDADD = \ lxc_monitor_LDADD = \
$(top_builddir)/src/liblxc/liblxc.la $(top_builddir)/src/lxc/liblxc.la
lxc_low_monitor_SOURCES = lxc_low_monitor.c lxc_low_monitor_SOURCES = lxc_low_monitor.c
lxc_low_monitor_LDADD = \ lxc_low_monitor_LDADD = \
$(top_builddir)/src/liblxc/liblxc.la $(top_builddir)/src/lxc/liblxc.la
lxc_state_SOURCES = lxc_state.c lxc_state_SOURCES = lxc_state.c
lxc_state_LDADD = \ lxc_state_LDADD = \
$(top_builddir)/src/liblxc/liblxc.la $(top_builddir)/src/lxc/liblxc.la

4
test/conf.c
View File

@ -27,8 +27,8 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <net/if.h> #include <net/if.h>
#include <lxc_list.h> #include <lxc/lxc_list.h>
#include <lxc_conf.h> #include <lxc/lxc_conf.h>
/* /*
* I want to setup a container with a veth attached on a bridge, * I want to setup a container with a veth attached on a bridge,

5
test/confile.c
View File

@ -30,9 +30,8 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <net/if.h> #include <net/if.h>
#include <lxc.h> #include <lxc/lxc.h>
#include <lxc/lxc_config.h>
#include "../src/lxc/lxc_config.h"
static void usage(const char *cmd) static void usage(const char *cmd)
{ {

2
test/dev.c
View File

@ -28,7 +28,7 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/types.h> #include <sys/types.h>
#include <network.h> #include <lxc/network.h>
void usage(char *cmd) void usage(char *cmd)
{ {

2
test/forward.c
View File

@ -27,7 +27,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <network.h> #include <lxc/network.h>
void usage(const char *cmd) void usage(const char *cmd)
{ {

2
test/ipv4_add.c
View File

@ -27,7 +27,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <network.h> #include <lxc/network.h>
void usage(char *cmd) void usage(char *cmd)
{ {

2
test/ipv6_add.c
View File

@ -27,7 +27,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <network.h> #include <lxc/network.h>
void usage(char *cmd) void usage(char *cmd)
{ {

2
test/lxc_create.c
View File

@ -30,7 +30,7 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <net/if.h> #include <net/if.h>
#include <lxc.h> #include <lxc/lxc.h>
static void usage(const char *cmd) static void usage(const char *cmd)
{ {

3
test/lxc_destroy.c
View File

@ -22,7 +22,8 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
#include <lxc.h>
#include <lxc/lxc.h>
static void usage(const char *cmd) static void usage(const char *cmd)
{ {

2
test/lxc_low_monitor.c
View File

@ -25,7 +25,7 @@
#include <string.h> #include <string.h>
#include <libgen.h> #include <libgen.h>
#include <lxc.h> #include <lxc/lxc.h>
void usage(char *cmd) void usage(char *cmd)
{ {

2
test/lxc_monitor.c
View File

@ -25,7 +25,7 @@
#include <string.h> #include <string.h>
#include <libgen.h> #include <libgen.h>
#include <lxc.h> #include <lxc/lxc.h>
void usage(char *cmd) void usage(char *cmd)
{ {

2
test/lxc_start.c
View File

@ -33,7 +33,7 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <net/if.h> #include <net/if.h>
#include <lxc.h> #include <lxc/lxc.h>
void usage(char *cmd) void usage(char *cmd)
{ {

2
test/lxc_state.c
View File

@ -25,7 +25,7 @@
#include <string.h> #include <string.h>
#include <libgen.h> #include <libgen.h>
#include <lxc.h> #include <lxc/lxc.h>
void usage(char *cmd) void usage(char *cmd)
{ {

2
test/lxc_stop.c
View File

@ -25,7 +25,7 @@
#include <string.h> #include <string.h>
#include <libgen.h> #include <libgen.h>
#include <lxc.h> #include <lxc/lxc.h>
void usage(char *cmd) void usage(char *cmd)
{ {

2
test/macvlan.c
View File

@ -27,7 +27,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <network.h> #include <lxc/network.h>
void usage(const char *cmd) void usage(const char *cmd)
{ {

2
test/movedev.c
View File

@ -26,7 +26,7 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/types.h> #include <sys/types.h>
#include <network.h> #include <lxc/network.h>
void usage(const char *cmd) void usage(const char *cmd)
{ {

2
test/proxy.c
View File

@ -27,7 +27,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <network.h> #include <lxc/network.h>
void usage(const char *cmd) void usage(const char *cmd)
{ {

2
test/tst_list.c
View File

@ -1,6 +1,6 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <lxc_list.h> #include <lxc/lxc_list.h>
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {

2
test/veth.c
View File

@ -27,7 +27,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <network.h> #include <lxc/network.h>
void usage(const char *cmd) void usage(const char *cmd)
{ {