mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compilation warnings 

Sun Feb  7 05:29:17 1999  Timur Bakeyev <mc@bat.ru>

	* Makefile.in: Remove references and dependences to/from libslang -
	we don't need this in GNOME. Changed the order of linking - libgtkedit
	require libgnomeui.a, so swap $(LDFLAGS) and $(EXTRALIBS). The same for
	corba edition.

	gdnd.c, gmetadata.c, gpopup2.c, gtools.c: Adde #include "global.h" or
	move it before #include <gnome.h> to avoid warnings about redefining
	MIN, MAX nad RE_DUP_MAX. More clean compiling.

	* gpopup2.h: New file - to avoid errors during "make distcheck". What
	it is for, really?
This commit is contained in:
Timur Bakeyev 1999-02-07 02:35:57 +00:00
parent 2127b21146
commit 98ba8892ec
6 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gnome/Makefile.in
View File

@ -6,12 +6,12 @@ rootdir = $(srcdir)/..
GNOMEDEFS = -DHAVE_X -DHAVE_GNOME @GNOME_INCLUDEDIR@
CFLAGS = -g $(XCFLAGS) @X_CFLAGS@ -I. -I$(rootdir)/src
CPPFLAGS = $(XCPPFLAGS) -I$(vfsdir) -I$(slangdir) $(GNOMEDEFS)
CPPFLAGS = $(XCPPFLAGS) -I$(vfsdir) $(GNOMEDEFS)
LDFLAGS = $(XLDFLAGS) @GNOME_LIBDIR@ @GNOMEUI_LIBS@
CORBA_LDFLAGS = $(XLDFLAGS) @GNOME_LIBDIR@ @GNOMEGNORBA_LIBS@
DEFS = $(XDEFS)
LIBS = $(XLIBS) @TERMNET@
EXTRALIBS = @LVFS@ -lgtkedit @LINTL@
EXTRALIBS = -L../vfs @LVFS@ -L../gtkedit -lgtkedit @LINTL@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
@ -204,11 +204,11 @@ mx: checklinks
@echo -----------------------------------------------------------
@touch mx
plain-gmc: @LIBVFS@ $(OBJS) $(NORMALOBJS) @LIBSLANG@ libgtkedit.a
$(CC) -o plain-gmc $(NORMALOBJS) $(OBJS) $(LDFLAGS) -L../vfs -L../slang -L../gtkedit $(EXTRALIBS) $(LIBS)
plain-gmc: @LIBVFS@ $(OBJS) $(NORMALOBJS) libgtkedit.a
$(CC) -o plain-gmc $(NORMALOBJS) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS)
corba-gmc: @LIBVFS@ $(OBJS) $(CORBAOBJS) @LIBSLANG@ libgtkedit.a
$(CC) -o corba-gmc $(CORBAOBJS) $(OBJS) $(CORBA_LDFLAGS) -L../vfs -L../slang -L../gtkedit $(EXTRALIBS) $(LIBS)
corba-gmc: @LIBVFS@ $(OBJS) $(CORBAOBJS) libgtkedit.a
$(CC) -o corba-gmc $(CORBAOBJS) $(OBJS) $(EXTRALIBS) $(CORBA_LDFLAGS) $(LIBS)
mc.keys: mc.keys.in Makefile
sed -e 's^\@icondir\@^$(icondir)^g' < mc.keys.in > mc.keys.tmp \
@ -222,11 +222,6 @@ mc.keys.in: mc.keys.in.in Makefile.in ../config.status
@PCENTRULE@ -$(RMF) @LIBVFS@
@PCENTRULE@ $(LN_S) ../vfs/@LIBVFS@ .
libmcslang.a:
cd ../slang; $(MAKE) libmcslang.a
@PCENTRULE@ -$(RMF) libmcslang.a
@PCENTRULE@ $(LN_S) ../slang/libmcslang.a .
libgtkedit.a:
cd ../gtkedit; $(MAKE) libgtkedit.a
@PCENTRULE@ -$(RMF) libgtkedit.a
@ -255,7 +250,7 @@ TAGS: $(GNOMESRCS)
etags $(GNOMESRCS)
clean:
$(RMF) plain-gmc corba-gmc *.o core a.out mx @LIBVFS@ libgtkedit.a libmcslang.a
$(RMF) plain-gmc corba-gmc *.o core a.out mx @LIBVFS@ libgtkedit.a
realclean: clean
$(RMF) .depend
@ -276,19 +271,18 @@ install: install_@mx@
install_:
install_mx: all
$(mcsrcdir)/xmkdir $(DESTDIR)$(bindir)
$(mcsrcdir)/xmkdir $(DESTDIR)$(icondir)
$(mcsrcdir)/xmkdir $(DESTDIR)$(libdir)
$(mcsrcdir)/xmkdir $(DESTDIR)$(bindir)
$(mcsrcdir)/xmkdir $(gnewdir)
$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
$(MKINSTALLDIRS) $(DESTDIR)$(icondir)
$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
$(MKINSTALLDIRS) $(DESTDIR)$(datadir)/mime-info
$(MKINSTALLDIRS) $(DESTDIR)$(corbadir)
$(MKINSTALLDIRS) $(gnewdir)
$(INSTALL_PROGRAM) plain-gmc $(DESTDIR)$(bindir)/$(binprefix)plain-gmc
$(INSTALL_PROGRAM) corba-gmc $(DESTDIR)$(bindir)/$(binprefix)gmc
for I in $(ICONS); \
do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(icondir)/$$I; done
$(INSTALL_DATA) $(srcdir)/layout $(DESTDIR)$(libdir)/layout
$(mcsrcdir)/xmkdir $(DESTDIR)$(datadir)/mime-info
$(INSTALL_DATA) mc.keys $(DESTDIR)$(datadir)/mime-info
$(mcsrcdir)/xmkdir $(DESTDIR)$(corbadir)
$(INSTALL_DATA) $(srcdir)/gmc.gnorba $(DESTDIR)$(corbadir)
uninstall:

1
gnome/gdnd.c
View File

@ -9,6 +9,7 @@
#include <config.h>
#include <sys/stat.h>
#include <sys/types.h>
#include "global.h"
#include "file.h"
#include "fileopctx.h"
#include "main.h"

2
gnome/gmetadata.c
View File

@ -6,8 +6,8 @@
*/
#include <config.h>
#include <libgnome/libgnome.h>
#include "global.h"
#include <libgnome/libgnome.h>
#include "gmetadata.h"
#include <sys/stat.h>
#include "../vfs/vfs.h"

5
gnome/gpopup2.c
View File

@ -12,15 +12,16 @@
*/
#include <config.h>
#include "global.h"
#include <gnome.h>
#include "../vfs/vfs.h"
#include "panel.h"
#include "cmd.h"
#include "dialog.h"
#include "ext.h"
#include "main.h"
#include "../vfs/vfs.h"
#include "gpageprop.h"
#include "gpopup.h"
#include "main.h"
#include "gnome-file-property-dialog.h"
#define CLIST_FROM_SW(panel_list) GTK_CLIST (GTK_BIN (panel_list)->child)

0
gnome/gpopup2.h Normal file
View File

4
gnome/gtools.c
View File

@ -4,16 +4,16 @@
* Written by Miguel de Icaza
*/
#include <config.h>
#include "myslang.h"
#include "global.h"
#include <gnome.h>
#include <gdk/gdkkeysyms.h>
#include <string.h>
#include "global.h"
#include "gconf.h"
#include "dlg.h"
#undef HAVE_LIBGPM
#include "mouse.h"
#include "key.h"
#include "myslang.h"
#include "widget.h"
#include "wtools.h"
#include "dialog.h"