Browse Source

Reorganization of usage external libs

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
Slava Zanko 15 years ago
parent
commit
7815c9c7a8
5 changed files with 7 additions and 10 deletions
  1. 1 2
      lib/Makefile.am
  2. 0 2
      lib/filehighlight/Makefile.am
  3. 0 2
      lib/search/Makefile.am
  4. 0 2
      lib/skin/Makefile.am
  5. 6 2
      src/Makefile.am

+ 1 - 2
lib/Makefile.am

@@ -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

+ 0 - 2
lib/filehighlight/Makefile.am

@@ -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)

+ 0 - 2
lib/search/Makefile.am

@@ -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)

+ 0 - 2
lib/skin/Makefile.am

@@ -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)

+ 6 - 2
src/Makefile.am

@@ -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