Changeset bae014d9f22e13f6115d53d154e6489f20ae00e4 for src/Makefile.am

Timestamp:

06/09/09 10:07:55 (3 years ago)

Author:

Neutron Soutmun <neo.neutron@…>

Children:

7751a641e2a294d986b002dd01264b7d068258a2

Parents:

927d0c70c763dcf56e6f12ebe02a51688468a5c3

git-committer:

Neutron Soutmun <neo.neutron@…> (06/09/09 10:07:55)

Message:

Adjust build system config and install files

• Adjust build system config to install the files to appropriate paths.
• The MAINTAINERCLEANFILES was added.
• Now rahunas.db installed into the default directory /var/lib/rahunas.
• RahuNAS daemon executable file (rahunasd) now installed into /usr/sbin.
• Tool scripts now installed into the /usr/sbin and their names change to satisfy the debian policy.

Files:

• src/Makefile.am (modified) (1 diff)

src/Makefile.am

@@ -1 @@
-SUBDIRS = include/linux/netfilter_ipv4
+MAINTAINERCLEANFILES = Makefile.in
 
-bin_PROGRAMS = rahunasd
+sbin_PROGRAMS = rahunasd
 
 IPSET_VERSION:=2.3.3
 
 AM_CFLAGS = \
-        $(LIBGNET_CFLAGS) \
-        $(LIBGDA_CFLAGS) \
-        -I$(top_builddir)/src/include/ \
-        -DRAHUNAS_VERSION=\"$(RAHUNAS_VERSION)\" \
-        -DPROGRAM=\"$(PROGRAM)\" \
-        -DIPSET_VERSION=\"$(IPSET_VERSION)\" \
-        -DRAHUNAS_CONF_DIR=\"$(sysconfdir)/rahunas/\" \
+  $(LIBGNET_CFLAGS) \
+  $(LIBGDA_CFLAGS) \
+  -I$(top_builddir)/src/include/ \
+  -DRAHUNAS_VERSION=\"$(RAHUNAS_VERSION)\" \
+  -DPROGRAM=\"$(PROGRAM)\" \
+  -DIPSET_VERSION=\"$(IPSET_VERSION)\" \
+  -DRAHUNAS_CONF_DIR=\"$(sysconfdir)/rahunas/\" \
+  -DRAHUNAS_DB_DIR=\"$(localstatedir)/lib/rahunas/\" \
   -DRAHUNAS_LOG_DIR=\"$(localstatedir)/log/rahunas/\" \
-  -DRAHUNAS_RUN_DIR=\"$(localstatedir)/run/\"
+  -DRAHUNAS_RUN_DIR=\"$(localstatedir)/run/\" \
+  -DRAHUNAS_FIREWALL_WRAPPER=\"$(sbindir)/rahunas-firewall\" \
+  -DRAHUNAS_BANDWIDTH_WRAPPER=\"$(sbindir)/rahunas-bandwidth\"
 
 rahunasd_SOURCES = \
-        rahunasd.c \
-        rahunasd.h \
-        rh-server.c \
-        rh-server.h \
-        rh-xmlrpc-server.c \
-        rh-xmlrpc-server.h \
-        rh-xmlrpc-cmd.c \
-        rh-xmlrpc-cmd.h \
+  rahunasd.c \
+  rahunasd.h \
+  rh-server.c \
+  rh-server.h \
+  rh-xmlrpc-server.c \
+  rh-xmlrpc-server.h \
+  rh-xmlrpc-cmd.c \
+  rh-xmlrpc-cmd.h \
   rh-ipset.c \
-        rh-ipset.h \
-        rh-utils.c \
-        rh-utils.h \
-        rh-task.c \
-        rh-task.h \
-        rh-task-iptables.c \
-        rh-task-iptables.h \
-        rh-task-memset.c \
-        rh-task-memset.h \
-        rh-task-ipset.c \
-        rh-task-ipset.h \
-        rh-task-dbset.c \
-        rh-task-dbset.h \
+  rh-ipset.h \
+  rh-utils.c \
+  rh-utils.h \
+  rh-task.c \
+  rh-task.h \
+  rh-task-iptables.c \
+  rh-task-iptables.h \
+  rh-task-memset.c \
+  rh-task-memset.h \
+  rh-task-ipset.c \
+  rh-task-ipset.h \
+  rh-task-dbset.c \
+  rh-task-dbset.h \
   rh-task-bandwidth.c \
   rh-task-bandwidth.h \
   rh-radius.h \
   rh-config.c \
-        rh-config.h
+  rh-config.h
 
 rahunasd_LDADD =  \
-        $(top_builddir)/xmlrpc/libgnetxmlrpc.a \
+  $(top_builddir)/xmlrpc/libgnetxmlrpc.a \
   $(top_builddir)/lcfg/liblcfg.a \
-        $(LIBGNET_LIBS) \
-        $(LIBGDA_LIBS)
+  $(LIBGNET_LIBS) \
+  $(LIBGDA_LIBS)
+
+noinst_HEADERS = \
+  include/linux/netfilter_ipv4/ip_set.h \
+  include/linux/netfilter_ipv4/ip_set_rahunas.h
+