EXTRA_DIST += doc/rrace-motif.1
-noinst_HEADERS = conf_post.h src/version.h src/icon.h src/ewmhicon.h
+noinst_HEADERS = conf_post.h src/version.h src/icon.h src/ewmhicon.h \
+ common/src/xtra.h
rrace_curses_SOURCES = common/src/help.c src/game.c src/version.c
rrace_curses_LDADD = $(libcursesmain_a_OBJECTS) $(CURSES_LIBS) $(GNULIB)
-Subproject commit 203a69fab1ff61e958dfb88599fd5d7f24648abf
+Subproject commit e599119f0492b01f1f21a8cce8d695c314dab3b1
#include <curses.h>
#include "help.h"
+#include "xtra.h"
#include "version.h"
#include "cursesui.h"
};
static const char *progname = "rrace";
-static const struct option lopts[] = { LOPTS_INITIALIZER, {0} };
static struct app_state state;
fprintf(f, "Try %s --help for more information.\n", progname);
}
-static void print_help(void)
+static void print_help(const struct option *lopts)
{
struct lopt_help help = {0};
const struct option *opt;
int enable_mouse = 1;
int opt;
+ XTRA_PACKED_LOPTS(lopts);
+
if (argc > 0)
progname = argv[0];
print_version();
exit(EXIT_SUCCESS);
case LOPT_HELP:
- print_help();
+ print_help(lopts);
exit(EXIT_SUCCESS);
default:
print_usage(stderr);
#include <Xm/XmAll.h>
#include "help.h"
+#include "xtra.h"
#include "motif.h"
#include "ewmhicon.h"
#include "motifopt.h"
#define PROGNAME "rrace"
static const char *progname = PROGNAME;
-static const struct option lopts[] = { LOPTS_INITIALIZER, {0} };
static char * const default_resources[] = {
"*title: RRace",
fprintf(f, "Try %s --help for more information.\n", progname);
}
-static void print_help(void)
+static void print_help(const struct option *lopts)
{
struct lopt_help help = {0};
const struct option *opt;
Widget shell;
int opt;
+ XTRA_PACKED_LOPTS(lopts);
+
/* Check for --help/--version early (before X connection) */
opterr = 0;
while ((opt = getopt_long_only(argc, argv, "", lopts, NULL)) != -1) {
print_version();
exit(EXIT_SUCCESS);
case LOPT_HELP:
- print_help();
+ print_help(lopts);
exit(EXIT_SUCCESS);
}
}