diff options
| author | Ting-Wei Lan <lantw44@gmail.com> | 2013-07-19 01:15:18 +0800 |
|---|---|---|
| committer | LAN-TW <lantw44@gmail.com> | 2013-07-19 01:17:02 +0800 |
| commit | dcf5cdda0b9acfd90082f6c1883235e81540fe7a (patch) | |
| tree | 0aa687ea00a91a107982ad90a88cd9c02e52cfd4 | |
| parent | 811c8127b9a13af63933a393d8b90c29c2dc5a3a (diff) | |
| download | gsoc2013-epiphany-dcf5cdda0b9acfd90082f6c1883235e81540fe7a.tar gsoc2013-epiphany-dcf5cdda0b9acfd90082f6c1883235e81540fe7a.tar.gz gsoc2013-epiphany-dcf5cdda0b9acfd90082f6c1883235e81540fe7a.tar.bz2 gsoc2013-epiphany-dcf5cdda0b9acfd90082f6c1883235e81540fe7a.tar.lz gsoc2013-epiphany-dcf5cdda0b9acfd90082f6c1883235e81540fe7a.tar.xz gsoc2013-epiphany-dcf5cdda0b9acfd90082f6c1883235e81540fe7a.tar.zst gsoc2013-epiphany-dcf5cdda0b9acfd90082f6c1883235e81540fe7a.zip | |
Fix some trivial things in the build system
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | autoarchive/autoar-extract.c | 16 | ||||
| -rw-r--r-- | autoarchive/autoar-extract.h | 4 |
3 files changed, 16 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 92be81c14..3583fbce9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = lib embed src autoarchive data po doc +SUBDIRS = autoarchive lib embed src data po doc if ENABLE_TESTS SUBDIRS += tests diff --git a/autoarchive/autoar-extract.c b/autoarchive/autoar-extract.c index 0a42d562a..c30d70c04 100644 --- a/autoarchive/autoar-extract.c +++ b/autoarchive/autoar-extract.c @@ -29,15 +29,25 @@ #include <archive.h> #include <archive_entry.h> -#include <fcntl.h> #include <gio/gio.h> -#include <grp.h> -#include <pwd.h> #include <string.h> #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> +#if defined HAVE_MKFIFO || defined HAVE_MKNOD +# include <fcntl.h> +#endif + +#ifdef HAVE_GETPWNAM +# include <pwd.h> +#endif + +#ifdef HAVE_GETGRNAM +# include <grp.h> +#endif + + G_DEFINE_TYPE (AutoarExtract, autoar_extract, G_TYPE_OBJECT) #define AUTOAR_EXTRACT_GET_PRIVATE(o) \ diff --git a/autoarchive/autoar-extract.h b/autoarchive/autoar-extract.h index ed2a7fc3d..37c335ed5 100644 --- a/autoarchive/autoar-extract.h +++ b/autoarchive/autoar-extract.h @@ -31,7 +31,7 @@ G_BEGIN_DECLS -#define AUTOAR_TYPE_EXTRACT autoar_extract_get_type() +#define AUTOAR_TYPE_EXTRACT autoar_extract_get_type () #define AUTOAR_EXTRACT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), AUTOAR_TYPE_EXTRACT, AutoarExtract)) #define AUTOAR_EXTRACT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), AUTOAR_TYPE_EXTRACT, AutoarExtractClass)) #define AUTOAR_IS_EXTRACT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), AUTOAR_TYPE_EXTRACT)) @@ -91,4 +91,4 @@ void autoar_extract_set_completed_files (AutoarExtract *arextract, G_END_DECLS -#endif /* __AUTOARCHIVE_EXTRACT_H__ */ +#endif /* AUTOAR_EXTRACT_H */ |