diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2010-10-27 17:59:02 +0200 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2010-10-30 16:29:14 +0200 |
| commit | 393df7a83c0a779784095a993db238867daeaa7a (patch) | |
| tree | 2643d82c8a319b1c42927b5b6987666b29cf64b4 /src | |
| parent | 8d9d6128b69e641c2b77322e8832be8ae0b9bf93 (diff) | |
| download | nautilus-393df7a83c0a779784095a993db238867daeaa7a.tar.gz | |
build: simplify configure script
Also, don't support old exif/exempi APIs anymore.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 7 | ||||
| -rw-r--r-- | src/file-manager/Makefile.am | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index c9fdc066b..77fff66bd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -17,7 +17,9 @@ INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/cut-n-paste-code \ -I$(top_builddir)/libnautilus-private \ - $(CORE_CFLAGS) \ + $(BASE_CFLAGS) \ + $(COMMON_CFLAGS) \ + $(NAUTILUS_CFLAGS) \ $(WARNING_CFLAGS) \ $(EXIF_CFLAGS) \ $(EXEMPI_CFLAGS) \ @@ -36,6 +38,9 @@ INCLUDES = \ LDADD =\ $(top_builddir)/src/file-manager/libnautilus-file-manager.la \ $(top_builddir)/libnautilus-private/libnautilus-private.la \ + $(BASE_LIBS) \ + $(COMMON_LIBS) \ + $(NAUTILUS_LIBS) \ $(CORE_LIBS) \ $(EXIF_LIBS) \ $(EXEMPI_LIBS) \ diff --git a/src/file-manager/Makefile.am b/src/file-manager/Makefile.am index d5cc81cb2..9d6490960 100644 --- a/src/file-manager/Makefile.am +++ b/src/file-manager/Makefile.am @@ -5,7 +5,9 @@ noinst_LTLIBRARIES=libnautilus-file-manager.la INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/cut-n-paste-code \ - $(CORE_CFLAGS) \ + $(BASE_CFLAGS) \ + $(COMMON_CFLAGS) \ + $(NAUTILUS_CFLAGS) \ $(WARNING_CFLAGS) \ -DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \ -DDATADIR=\""$(datadir)"\" \ |