1 files changed, 5 insertions, 10 deletions

diff --git a/src/lsaddr-cl.opt b/src/lsaddr-cl.opt
index 071bb27..c663f51 100644
--- a/src/lsaddr-cl.opt
+++ b/src/lsaddr-cl.opt
@@ -14,12 +14,8 @@
    You should have received a copy of the GNU General Public License
    along with Eclat.  If not, see <http://www.gnu.org/licenses/>. */
 
-OPTIONS_COMMAND_BEGIN("eclat",
-              [<lsaddr, describe-addresses>],
-              [<describe elastic IP addresses>],
-              [<[FILTER...]>],
-              [<gnu>],
-              [<noversion>])
+ECLAT_CL_BEGIN([<describe elastic IP addresses>],
+               [<[FILTER...]>])
 
 OPTION(vpc,v,,
        [<describe VPC addresses>])
@@ -27,7 +23,7 @@ BEGIN
         vpc = 1;
 END
 
-OPTIONS_END
+ECLAT_CL_END
 
 static char *domain_str[] = { "standard", "vpc", NULL };
 static struct filter_descr filters[] = {
@@ -42,11 +38,10 @@ static struct filter_descr filters[] = {
         { NULL }
 };
         
-static void
-parse_options(int argc, char *argv[], int *index)
+ECLAT_CL_PARSER(parse_options, [<int argc, char *argv[], int *index>], [<
 {
         available_filters = filters;
         proginfo.print_help_hook = list_filters;
         GETOPT(argc, argv, *index, exit(EX_USAGE))
 }
-        
+>])