diogo/libcfu
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace libcfu-config utility with a pkg-config .pc file

Browse Source
This commit is contained in:
Matthew Brush 2013-03-04 15:10:02 -08:00
parent 8b89377762
commit 382bac9900
6 changed files with 19 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -19,3 +19,4 @@ Makefile.in
/m4/
/src/config.*
/doc/stamp-vti
/libcfu.pc

3
Makefile.am
View File

@ -1 +1,4 @@
SUBDIRS = src examples doc
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libcfu.pc

1
configure.ac
View File

@ -41,6 +41,7 @@ fi
AM_CONDITIONAL([USE_PTHREADS], [test x$have_pthreads = xyes])
AC_CONFIG_FILES([
libcfu.pc
Makefile
src/Makefile
examples/Makefile

10
libcfu.pc.in Normal file
View File

@ -0,0 +1,10 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: @PACKAGE_NAME@
Description: Portable C data structure and utility library
Version: @PACKAGE_VERSION@
Libs.private: @PTHREAD_LIBS@
Cflags: -I${includedir}/cfu

18
src/Makefile.am
View File

@ -4,21 +4,11 @@ libcfu_a_SOURCES = cfuhash.c cfutime.c cfustring.c cfulist.c cfuconf.c \
cfu.c cfuopt.c
include_HEADERS = cfu.h cfuhash.h cfutime.h cfustring.h cfulist.h \
cfuconf.h cfuopt.h
libcfuincdir = $(includedir)/cfu
libcfuinc_HEADERS = cfu.h cfuhash.h cfutime.h cfustring.h cfulist.h \
cfuconf.h cfuopt.h
if USE_PTHREADS
libcfu_a_SOURCES += cfuthread_queue.c
include_HEADERS += cfuthread_queue.h
libcfuinc_HEADERS += cfuthread_queue.h
endif
bin_PROGRAMS = libcfu-config
# TODO: provide a pkg-config .pc file instead
libcfu_config_SOURCES = libcfu-config.c
libcfu_config_CFLAGS = -DCFU_LIBDIR="\"@libdir@\"" \
-DCFU_LIBS="\"@LIBS@\"" \
-DCFU_INCLUDEDIR="\"@includedir@\"" \
-DCFU_PREFIX="\"@prefix@\"" \
-DCFU_EXEC_PREFIX="\"@exec_prefix@\""
libcfu_config_LDADD = libcfu.a

74
src/libcfu-config.c
View File

@ -1,74 +0,0 @@
/* Creation date: 2005-08-07 13:34:49
* Authors: Don
* Change log:
*/
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include "cfu.h"
#include "cfuopt.h"
#define GET_PREFIX CFU_PREFIX
#define GET_EXEC_PREFIX CFU_EXEC_PREFIX
#define GET_VERSION LIBCFU_VERSION
#define GET_LIBS "-L" CFU_LIBDIR " -lcfu " CFU_LIBS
#define GET_CFLAGS "-I" CFU_INCLUDEDIR
static void
print_usage() {
fprintf(stderr, "Usage: libcfu-config [OPTIONS]\n");
fprintf(stderr, "Options:\n");
fprintf(stderr, " --prefix [%s]\n", GET_PREFIX);
fprintf(stderr, " --exec-prefix [%s]\n", GET_EXEC_PREFIX);
fprintf(stderr, " --version [%s]\n", GET_VERSION);
fprintf(stderr, " --libs [%s]\n", GET_LIBS);
fprintf(stderr, " --cflags [%s]\n", GET_CFLAGS);
}
int main(int argc, char **argv) {
char *arg = NULL;
int do_prefix = 0;
int do_exec_prefix = 0;
int do_version = 0;
int do_libs = 0;
int do_cflags = 0;
cfuopt_t *options = cfuopt_new();
char *error = NULL;
cfuopt_add_entry(options, "prefix!", &do_prefix, "Display install prefix", NULL);
cfuopt_add_entry(options, "exec-prefix!", &do_exec_prefix, "Display install prefix for executables", NULL);
cfuopt_add_entry(options, "version!", &do_version, "Display library version", NULL);
cfuopt_add_entry(options, "libs!", &do_libs, "Display libraries required for linking with this library", NULL);
cfuopt_add_entry(options, "cflags", &do_cflags, "Display CFLAGS required for compilation", NULL);
if (argc < 2) {
print_usage();
exit(1);
}
cfuopt_parse(options, &argc, &argv, &error);
arg = argv[1];
if (do_prefix) {
fprintf(stdout, "%s\n", GET_PREFIX);
} else if (do_exec_prefix) {
fprintf(stdout, "%s\n", GET_EXEC_PREFIX);
} else if (do_version) {
fprintf(stdout, "%s\n", GET_VERSION);
} else if (do_libs) {
fprintf(stdout, "%s\n", GET_LIBS);
} else if (do_cflags) {
fprintf(stdout, "%s\n", GET_CFLAGS);
} else {
print_usage();
cfuopt_destroy(options);
exit(1);
}
cfuopt_destroy(options);
return 0;
}