mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 12:32:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Makefile.ams cleanup.

Browse Source 
Set defines via CPPFLAGS variable not via CFLAGS one.
Use AM_CPPFLAGS and AM_CFLAGS variables instead of per-target ones.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2012-07-10 10:53:56 +04:00
parent 94bd4b1f78
commit b37af47023
27 changed files with 66 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Makefile.am
View File

@ -5,7 +5,7 @@ if ENABLE_MCLIB
tr '.' ' '| \ tr '.' ' '| \
while read v1 v2 v3; do echo $$v2':'$$v3':'$$v1; done` while read v1 v2 v3; do echo $$v2':'$$v3':'$$v1; done`
libmc_la_LDFLAGS=-no-undefined -version-info $(LIB_VERSION) -release $(LIBMC_RELEASE) AM_LDFLAGS=-no-undefined -version-info $(LIB_VERSION) -release $(LIBMC_RELEASE)
lib_LTLIBRARIES = libmc.la lib_LTLIBRARIES = libmc.la
else else
@ -50,7 +50,7 @@ if CHARSET
libmc_la_SOURCES += charsets.c charsets.h libmc_la_SOURCES += charsets.c charsets.h
endif endif
libmc_la_CFLAGS= $(GLIB_CFLAGS) -I$(top_srcdir) $(PCRE_CFLAGS) AM_CFLAGS= $(GLIB_CFLAGS) -I$(top_srcdir) $(PCRE_CFLAGS)
libmc_la_LIBADD = \ libmc_la_LIBADD = \
event/libmcevent.la \ event/libmcevent.la \
@ -72,4 +72,3 @@ else
endif endif
libmc_la_LIBADD += $(PCRE_LIBS) $(LIBICONV) $(INTLLIBS) libmc_la_LIBADD += $(PCRE_LIBS) $(LIBICONV) $(INTLLIBS)

8
lib/event/Makefile.am
View File

@ -7,6 +7,8 @@ libmcevent_la_SOURCES = \
manage.c \ manage.c \
raise.c raise.c
libmcevent_la_CFLAGS=-I$(top_srcdir) \ AM_CPPFLAGS = \
$(GLIB_CFLAGS) $(PCRE_CFLAGS) \ -DDATADIR=\""$(pkgdatadir)/"\" \
-DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\" -DLOCALEDIR=\""$(localedir)"\"
AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CFLAGS)

8
lib/filehighlight/Makefile.am
View File

@ -6,6 +6,8 @@ libmcfilehighlight_la_SOURCES = \
ini-file-read.c \ ini-file-read.c \
internal.h internal.h
libmcfilehighlight_la_CFLAGS = -I$(top_srcdir) \ AM_CPPFLAGS = \
$(GLIB_CFLAGS) $(PCRE_CFLAGS) \ -DDATADIR=\""$(pkgdatadir)/"\" \
-DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\" -DLOCALEDIR=\""$(localedir)"\"
AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CFLAGS)

5
lib/mcconfig/Makefile.am
View File

@ -7,6 +7,7 @@ libmcconfig_la_SOURCES = \
set.c \ set.c \
paths.c paths.c
libmcconfig_la_CFLAGS = -I$(top_srcdir) \ AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
-DLOCALEDIR=\""$(localedir)"\" -DLOCALEDIR=\""$(localedir)"\"
AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS)

8
lib/search/Makefile.am
View File

@ -9,6 +9,8 @@ libsearch_la_SOURCES = \
glob.c \ glob.c \
hex.c hex.c
libsearch_la_CFLAGS = -I$(top_srcdir) \ AM_CPPFLAGS = \
$(GLIB_CFLAGS) \ -DDATADIR=\""$(pkgdatadir)/"\" \
-DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\" $(PCRE_CFLAGS) -DLOCALEDIR=\""$(localedir)"\"
AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CFLAGS)

8
lib/skin/Makefile.am
View File

@ -9,6 +9,8 @@ libmcskin_la_SOURCES = \
lines.c \ lines.c \
internal.h internal.h
libmcskin_la_CFLAGS = -I$(top_srcdir) \ AM_CPPFLAGS = \
$(GLIB_CFLAGS) $(PCRE_CFLAGS) \ -DDATADIR=\""$(pkgdatadir)/"\" \
-DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\" -DLOCALEDIR=\""$(localedir)"\"
AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CFLAGS)

4
lib/strutil/Makefile.am
View File

@ -8,6 +8,4 @@ libmcstrutil_la_SOURCES = \
strutilutf8.c \ strutilutf8.c \
strverscmp.c strverscmp.c
AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS)
libmcstrutil_la_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS)

12
lib/tty/Makefile.am
View File

@ -22,13 +22,15 @@ TTY_SRC = \
libmctty_la_SOURCES = $(TTY_SRC) $(TTY_SCREEN_SRC) libmctty_la_SOURCES = $(TTY_SRC) $(TTY_SCREEN_SRC)
libmctty_la_CFLAGS = -I$(top_srcdir) AM_CPPFLAGS = \
-DDATADIR=\""$(pkgdatadir)/"\" \
-DLOCALEDIR=\""$(localedir)"\"
AM_CFLAGS = -I$(top_srcdir)
if HAVE_GMODULE if HAVE_GMODULE
libmctty_la_CFLAGS += $(GMODULE_CFLAGS) AM_CFLAGS += $(GMODULE_CFLAGS)
else else
libmctty_la_CFLAGS += $(GLIB_CFLAGS) AM_CFLAGS += $(GLIB_CFLAGS)
endif endif
libmctty_la_CFLAGS += -DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\"

8
lib/widget/Makefile.am
View File

@ -22,6 +22,8 @@ libmcwidget_la_SOURCES = \
widget-common.c widget-common.h \ widget-common.c widget-common.h \
wtools.c wtools.h wtools.c wtools.h
libmcwidget_la_CFLAGS = -I$(top_srcdir) \ AM_CPPFLAGS = \
$(GLIB_CFLAGS) $(PCRE_CFLAGS) \ -DDATADIR=\""$(pkgdatadir)/"\" \
-DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\" -DLOCALEDIR=\""$(localedir)"\"
AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CFLAGS)

2
src/Makefile.am
View File

@ -19,7 +19,7 @@ SUBDIRS += consaver
AM_CPPFLAGS += -DSAVERDIR=\""$(pkglibexecdir)"\" AM_CPPFLAGS += -DSAVERDIR=\""$(pkglibexecdir)"\"
endif endif
AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) $(PCRE_CFLAGS) AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CFLAGS)
localedir = $(datadir)/locale localedir = $(datadir)/locale
pkglibexecdir = $(libexecdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@

2
src/consaver/Makefile.am
View File

@ -4,4 +4,4 @@ pkglibexec_PROGRAMS = cons.saver
cons_saver_SOURCES = cons.saver.c cons_saver_SOURCES = cons.saver.c
cons_saver_CFLAGS= -I$(top_srcdir) AM_CFLAGS= -I$(top_srcdir)

7
src/diffviewer/Makefile.am
View File

@ -5,9 +5,10 @@ libdiffviewer_la_SOURCES = \
search.c \ search.c \
ydiff.c ydiff.h ydiff.c ydiff.h
AM_CPPFLAGS = \
-DDATADIR=\""$(pkgdatadir)/"\" \
-DLOCALEDIR=\""$(localedir)"\"
libdiffviewer_la_CFLAGS = -I$(top_srcdir) \ AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CFLAGS)
$(GLIB_CFLAGS) $(PCRE_CFLAGS) \
-DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\"
libdiffviewer_la_LIBADD = ../../lib/libmc.la libdiffviewer_la_LIBADD = ../../lib/libmc.la

2
src/editor/Makefile.am
View File

@ -21,4 +21,4 @@ libedit_la_SOURCES += \
endif endif
endif endif
libedit_la_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) $(PCRE_CFLAGS) AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) $(PCRE_CFLAGS)

8
src/filemanager/Makefile.am
View File

@ -31,8 +31,10 @@ libmcfilemanager_la_SOURCES = \
libmcfilemanager_la_SOURCES += mountlist.c mountlist.h libmcfilemanager_la_SOURCES += mountlist.c mountlist.h
#endif #endif
libmcfilemanager_la_CFLAGS = -I$(top_srcdir) \ AM_CPPFLAGS = \
$(GLIB_CFLAGS) $(PCRE_CFLAGS) \ -DDATADIR=\""$(pkgdatadir)/"\" \
-DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\" -DLOCALEDIR=\""$(localedir)"\"
AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CFLAGS)
libmcfilemanager_la_LIBADD = ../../lib/libmc.la libmcfilemanager_la_LIBADD = ../../lib/libmc.la

1
src/vfs/cpio/Makefile.am
View File

@ -1,5 +1,4 @@
AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
AM_CPPFLAGS =
noinst_LTLIBRARIES = libvfs-cpio.la noinst_LTLIBRARIES = libvfs-cpio.la

2
src/vfs/extfs/Makefile.am
View File

@ -1,8 +1,8 @@
SUBDIRS = helpers SUBDIRS = helpers
DIST_SUBDIRS = helpers DIST_SUBDIRS = helpers
AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
AM_CPPFLAGS = -DLIBEXECDIR=\""$(libexecdir)/@PACKAGE@/"\" AM_CPPFLAGS = -DLIBEXECDIR=\""$(libexecdir)/@PACKAGE@/"\"
AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
noinst_LTLIBRARIES = libvfs-extfs.la noinst_LTLIBRARIES = libvfs-extfs.la

2
src/vfs/fish/Makefile.am
View File

@ -1,8 +1,8 @@
SUBDIRS = helpers SUBDIRS = helpers
DIST_SUBDIRS = helpers DIST_SUBDIRS = helpers
AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
AM_CPPFLAGS = -DLIBEXECDIR=\""$(libexecdir)/@PACKAGE@/"\" AM_CPPFLAGS = -DLIBEXECDIR=\""$(libexecdir)/@PACKAGE@/"\"
AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
noinst_LTLIBRARIES = libvfs-fish.la noinst_LTLIBRARIES = libvfs-fish.la

1
src/vfs/ftpfs/Makefile.am
View File

@ -1,5 +1,4 @@
AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
AM_CPPFLAGS =
noinst_LTLIBRARIES = libvfs-ftpfs.la noinst_LTLIBRARIES = libvfs-ftpfs.la

1
src/vfs/local/Makefile.am
View File

@ -1,5 +1,4 @@
AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
AM_CPPFLAGS =
noinst_LTLIBRARIES = libvfs-local.la noinst_LTLIBRARIES = libvfs-local.la

1
src/vfs/sfs/Makefile.am
View File

@ -1,5 +1,4 @@
AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
AM_CPPFLAGS =
noinst_LTLIBRARIES = libvfs-sfs.la noinst_LTLIBRARIES = libvfs-sfs.la

1
src/vfs/sftpfs/Makefile.am
View File

@ -1,5 +1,4 @@
AM_CFLAGS = $(GLIB_CFLAGS) $(LIBSSH_CFLAGS) -I$(top_srcdir) AM_CFLAGS = $(GLIB_CFLAGS) $(LIBSSH_CFLAGS) -I$(top_srcdir)
AM_CPPFLAGS =
noinst_LTLIBRARIES = libvfs-sftpfs.la noinst_LTLIBRARIES = libvfs-sftpfs.la

4
src/vfs/smbfs/Makefile.am
View File

@ -2,8 +2,8 @@ DIST_SUBDIRS =
SUBDIRS = helpers SUBDIRS = helpers
AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) -DCONFIGDIR=\""@smbconfigdir@"\" AM_CPPFLAGS = -DCONFIGDIR=\""@smbconfigdir@"\"
AM_CPPFLAGS = AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
noinst_LTLIBRARIES = libvfs-smbfs.la noinst_LTLIBRARIES = libvfs-smbfs.la

1
src/vfs/tar/Makefile.am
View File

@ -1,5 +1,4 @@
AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
AM_CPPFLAGS =
noinst_LTLIBRARIES = libvfs-tar.la noinst_LTLIBRARIES = libvfs-tar.la

1
src/vfs/undelfs/Makefile.am
View File

@ -1,5 +1,4 @@
AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
AM_CPPFLAGS =
noinst_LTLIBRARIES = libvfs-undelfs.la noinst_LTLIBRARIES = libvfs-undelfs.la

10
src/viewer/Makefile.am
View File

@ -19,8 +19,10 @@ libmcviewer_la_SOURCES = \
plain.c \ plain.c \
search.c search.c
libmcviewer_la_CFLAGS = -I$(top_srcdir) \ AM_CPPFLAGS = \
$(GLIB_CFLAGS) $(PCRE_CFLAGS) \ -DDATADIR=\""$(pkgdatadir)/"\" \
-DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\" -DLOCALEDIR=\""$(localedir)"\"
libmcviewer_la_LIBADD = ../../lib/libmc.la AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CFLAGS)
libmcviewer_la_LIBADD = ../../lib/libmc.la

5
tests/lib/mcconfig/Makefile.am
View File

@ -1,5 +1,6 @@
AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) @CHECK_CFLAGS@ \
-DWORKDIR=\"$(abs_builddir)\" AM_CPPFLAGS = -DWORKDIR=\"$(abs_builddir)\"
AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) @CHECK_CFLAGS@
AM_LDFLAGS = -Wl,-z,muldefs AM_LDFLAGS = -Wl,-z,muldefs

5
tests/lib/vfs/Makefile.am
View File

@ -1,5 +1,6 @@
AM_CFLAGS = -I$(top_srcdir)/lib/vfs $(GLIB_CFLAGS) -I$(top_srcdir) @CHECK_CFLAGS@ \
-DTEST_SHARE_DIR=\"$(abs_srcdir)\" AM_CPPFLAGS = -DTEST_SHARE_DIR=\"$(abs_srcdir)\"
AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib/vfs $(GLIB_CFLAGS) @CHECK_CFLAGS@
AM_LDFLAGS = -Wl,-z,muldefs AM_LDFLAGS = -Wl,-z,muldefs