Reorganization of usage external libs

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
This commit is contained in:
Slava Zanko 2010-01-21 14:33:21 +02:00
parent cd4dbf3a09
commit 7815c9c7a8
5 changed files with 7 additions and 10 deletions

View File

@ -26,8 +26,7 @@ libmc_la_LIBADD = \
search/libsearch.la \
strutil/libmcstrutil.la \
skin/libmcskin.la \
tty/libmctty.la \
$(INTLLIBS) $(MCLIBS) $(SLANGLIB) $(LIBICONV) $(GLIB_LIBS)
tty/libmctty.la
if ENABLE_VFS
libmc_la_LIBADD += vfs/mc-vfs/libvfs-mc.la

View File

@ -10,5 +10,3 @@ libmcfilehighlight_la_SOURCES = \
libmcfilehighlight_la_CFLAGS = -I$(top_srcdir) \
$(GLIB_CFLAGS) $(PCRE_CFLAGS) \
-DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\"
libmcfilehighlight_la_LIBADD = $(PCRE_LIBS)

View File

@ -13,5 +13,3 @@ libsearch_la_SOURCES = \
libsearch_la_CFLAGS = -I$(top_srcdir) \
$(GLIB_CFLAGS) \
-DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\" $(PCRE_CFLAGS)
libsearch_la_LIBADD = $(PCRE_LIBS)

View File

@ -13,5 +13,3 @@ libmcskin_la_SOURCES = \
libmcskin_la_CFLAGS = -I$(top_srcdir) \
$(GLIB_CFLAGS) $(PCRE_CFLAGS) \
-DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\"
libmcskin_la_LIBADD = $(PCRE_LIBS)

View File

@ -30,7 +30,10 @@ mcmfmt_SOURCES = mfmt.c
cons_saver_SOURCES = cons.saver.c
man2hlp_SOURCES = man2hlp.c
man2hlp_LDADD = $(GLIB_LIBS) ../lib/libmc.la
man2hlp_LDADD = \
../lib/libmc.la \
$(GLIB_LIBS) $(PCRE_LIBS)
if USE_EDIT
EDITLIB = editor/libedit.la
@ -51,7 +54,8 @@ mc_LDADD = \
../lib/libmc.la \
$(EDITLIB) \
viewer/libmcviewer.la \
$(INTLLIBS) $(MCLIBS) $(SLANGLIB) $(LIBICONV) $(GLIB_LIBS)
$(INTLLIBS) $(MCLIBS) $(SLANGLIB) $(LIBICONV) \
$(GLIB_LIBS) $(PCRE_LIBS)
if USE_SAMBA_FS
# this is a hack for linking with own samba library in simple way