switched to command line handling with gengetopt

git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@737 96b47cad-a561-4643-ad3b-153ac7d7599c

npa/src/Makefile.am

@@ -1,4 +1,16 @@
-EXTRA_DIST = $(shell find -L $(top_srcdir)/src/opensc -path '*/.git' -prune -o -type f -a -name '*.h' -print)
+do_subst = sed \
+	   -e 's,[@]PACKAGE[@],$(PACKAGE),g' \
+	   -e 's,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g' \
+	   -e 's,[@]PACKAGE_TARNAME[@],$(PACKAGE_TARNAME),g' \
+	   -e 's,[@]PACKAGE_BUGREPORT[@],$(PACKAGE_BUGREPORT),g' \
+	   -e 's,[@]PACKAGE_URL[@],$(PACKAGE_URL),g' \
+	   -e 's,[@]PACKAGE_VERSION[@],$(PACKAGE_VERSION),g'
+
+BUILT_SOURCES = cmdline.h cmdline.c
+
+EXTRA_DIST  = npa-tool.ggo npa-tool.ggo.in
+EXTRA_DIST += $(shell find -L $(top_srcdir)/src/opensc -path '*/.git' -prune -o -type f -a -name '*.h' -print)
+DISTCLEANFILES = $(BUILT_SOURCES) npa-tool.ggo
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/npa -I$(top_srcdir)/src/opensc/src
 
@@ -6,11 +18,11 @@ libnpa_la_SOURCES = sm.c scutil.c npa.c sslutil.c
 libnpa_la_LIBADD = $(OPENSSL_LIBS) $(OPENSC_LIBS)
 libnpa_la_CFLAGS = $(OPENSSL_CFLAGS)
 libnpa_la_LDFLAGS = -no-undefined
-if WIN32
-libnpa_la_LIBADD += -lws2_32
-endif
+#if WIN32
+#libnpa_la_LIBADD += -lws2_32
+#endif
 
-npa_tool_SOURCES = npa-tool.c binutil.c
+npa_tool_SOURCES = npa-tool.c $(BUILT_SOURCES)
 npa_tool_LDADD = $(OPENSSL_LIBS) $(OPENSC_LIBS) libnpa.la
 npa_tool_CFLAGS = $(OPENSSL_CFLAGS)
 
@@ -19,14 +31,22 @@ example_LDADD = $(OPENSSL_LIBS) $(OPENSC_LIBS) libnpa.la
 example_CFLAGS = $(OPENSSL_CFLAGS)
 
 
+npa-tool.c: $(BUILT_SOURCES)
+
+$(BUILT_SOURCES): npa-tool.ggo
+	gengetopt --output-dir=$(srcdir) < $<
+
+npa-tool.ggo: npa-tool.ggo.in
+	$(do_subst) < $< > $(srcdir)/$@
+
+
 bin_PROGRAMS = npa-tool
 noinst_PROGRAMS = example
 
 lib_LTLIBRARIES = libnpa.la
 
 noinst_HEADERS = \
-		 sslutil.h \
-		 binutil.h
+		 sslutil.h
 
 nobase_include_HEADERS = \
 	npa/sm.h \