1 files changed, 6 insertions, 10 deletions

diff --git a/src/lssnap-cl.opt b/src/lssnap-cl.opt
index be1f0d9..bb020ca 100644
--- a/src/lssnap-cl.opt
+++ b/src/lssnap-cl.opt
@@ -24,12 +24,8 @@ struct param {
 
 static unsigned owner_idx = 1, rstby_idx = 1;
 
-OPTIONS_COMMAND_BEGIN("eclat",
-              [<lssnap, describe-snapshots>],
-              [<describe EC2 snapshots>],
-              [<[SNAP-ID...] [FILTER...]]>],
-              [<gnu>],
-              [<noversion>])
+ECLAT_CL_BEGIN([<describe EC2 snapshots>],
+               [<[SNAP-ID...] [FILTER...]]>])
 
 OPTION(owner,u,[<ID|self|amazon>],
        [<return the snapshots owned by the specified owner>])
@@ -50,12 +46,12 @@ BEGIN
         p->value = optarg;
         grecs_list_append(parmlist, p);
 END
+                
+ECLAT_CL_END
 
-OPTIONS_END
-
-static void
-parse_options(int argc, char *argv[], int *index)
+ECLAT_CL_PARSER(parse_options, [<int argc, char *argv[], int *index>], [<
 {
         parmlist = grecs_list_create();
         GETOPT(argc, argv, *index, exit(EX_USAGE))
 }
+>])