[Gnupos-cvs] gnp-server/src Makefile.am,1.1.1.1,1.2 main.c,1.1.1.1,1.2
Status: Pre-Alpha
Brought to you by:
conrad_c
From: <con...@us...> - 2003-02-09 12:36:54
|
Update of /cvsroot/gnupos/gnp-server/src In directory sc8-pr-cvs1:/tmp/cvs-serv7122/src Modified Files: Makefile.am main.c Log Message: Updates to make builds work, and fixes to popt stuff (so we don't require gnome). Index: Makefile.am =================================================================== RCS file: /cvsroot/gnupos/gnp-server/src/Makefile.am,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Makefile.am 27 Jan 2003 12:22:28 -0000 1.1.1.1 --- Makefile.am 9 Feb 2003 12:36:50 -0000 1.2 *************** *** 5,9 **** ## Please disable it in the Anjuta project configuration ! INCLUDES = CFLAGS =\ --- 5,9 ---- ## Please disable it in the Anjuta project configuration ! INCLUDES = ../include CFLAGS =\ *************** *** 15,23 **** gnp_server_SOURCES = \ ! main.c ! gnp_server_LDFLAGS = gnp_server_LDADD = \ -lcrypt --- 15,27 ---- gnp_server_SOURCES = \ ! main.c \ ! GNPS_comms.c \ ! GNPS_io.c \ ! GNPS_util.c ! gnp_server_LDFLAGS = $(GUILE_LIBS) gnp_server_LDADD = \ + -lpopt \ -lcrypt Index: main.c =================================================================== RCS file: /cvsroot/gnupos/gnp-server/src/main.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** main.c 27 Jan 2003 12:22:28 -0000 1.1.1.1 --- main.c 9 Feb 2003 12:36:50 -0000 1.2 *************** *** 27,35 **** #include <popt.h> ! #include "GNPS.h" ! int gnps_debug; ! int gnps_verbose; ! gnps_global_data_struct gnps_global_data; void --- 27,35 ---- #include <popt.h> ! #include "include/GNPS.h" ! int gnps_debug; ! int gnps_verbose; ! gnps_global_data_struct gnps_global_data; void *************** *** 69,82 **** {"configfile", 'c', POPT_ARG_STRING, &gnps_global_data.config_file_name, 0, "Configuration file to use", NULL}, ! {"debug", '\0', POPT_ARG_NONE, &gnp_debug, 0, "Enable debugging output (Very verbose)", NULL}, {"logfile", 'f', POPT_ARG_STRING, &gnps_global_data.log_file_name, 0, "Log file to use.", NULL}, ! {NULL, 0, 0, NULL, 0, NULL, NULL} }; printf("GnuPOS Server\nVersion: %s\n\n\n",VERSION); ! gnomelib_register_popt_table (options, "GnuPOS Server options"); if(gnps_verbose) --- 69,91 ---- {"configfile", 'c', POPT_ARG_STRING, &gnps_global_data.config_file_name, 0, "Configuration file to use", NULL}, ! {"debug", '\0', POPT_ARG_NONE, &gnps_debug, 0, "Enable debugging output (Very verbose)", NULL}, {"logfile", 'f', POPT_ARG_STRING, &gnps_global_data.log_file_name, 0, "Log file to use.", NULL}, ! POPT_AUTOHELP ! POPT_TABLEEND }; + poptContext pc; + int rc; printf("GnuPOS Server\nVersion: %s\n\n\n",VERSION); ! pc=poptGetContext("GnuPOS Server", argc, argv, options, POPT_CONTEXT_NO_EXEC); ! rc = poptGetNextOpt(pc); ! if(rc != -1) ! { ! printf("ERROR: popt returns error code %d\n",rc); ! exit(-1); ! } if(gnps_verbose) |