external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

dtfile: make it build

Browse source
This commit is contained in:
Jon Trulson 2019-10-30 10:59:45 -06:00
parent 89914f6168
commit 62e6e5c58c
5 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cde/programs/dtfile/FileManip.c
View file

@ -712,13 +712,13 @@ CopyDir(
rc = execlp(DTCOPY, "dtfile_copy", rc = execlp(DTCOPY, "dtfile_copy",
"-dontDelete", "-forceCopies", "-copyTop", "-dontDelete", "-forceCopies", "-copyTop",
"-confirmReplace", "-confirmErrors", "-popDown", "-confirmReplace", "-confirmErrors", "-popDown",
from, target, 0); from, target, (char *)NULL);
else else
/* replace target dir */ /* replace target dir */
rc = execlp(DTCOPY, "dtfile_copy", rc = execlp(DTCOPY, "dtfile_copy",
"-forceCopies", "-copyTop", "-forceCopies", "-copyTop",
"-confirmErrors", "-popDown", "-confirmErrors", "-popDown",
from, target, 0); from, target, (char *)NULL);
/* call errorhandler */ /* call errorhandler */
perror ("Could not exec child process \"dtfile_copy\""); perror ("Could not exec child process \"dtfile_copy\"");

11
cde/programs/dtfile/Makefile.am
View file

@ -5,18 +5,19 @@ SUBDIRS = dtcopy
bin_PROGRAMS = dtfile bin_PROGRAMS = dtfile
BUILT_SOURCES = dtfile.config dtfile_error BUILT_SOURCES = dtfile.config dtfile_error
CLEANFILES = dtfile.config dtfile_error
dist_config_DATA = dtfile.config dist_config_DATA = dtfile.config
dist_bin_SCRIPTS = dtfile_error dist_bin_SCRIPTS = dtfile_error
dtfile_CPPFLAGS = -I./dtcopy -I(TIRPCINC) -DSHAPE -D_ILS_MACROS -DSUN_PERF \ dtfile_CPPFLAGS = -I./dtcopy $(TIRPCINC) -DSHAPE -D_ILS_MACROS -DSUN_PERF \
-DUSE_XINERAMA -DCDE_INSTALLATION_TOP=\"${prefix}\" \ -DCDE_INSTALLATION_TOP=\"${prefix}\" \
-DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \ -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \
-DKORNSHELL=\"$(KSH)\" -I${x_includes}/freetype2 -DKORNSHELL=\"$(KSH)\" -I/usr/include/freetype2
dtfile_LDADD = $(LIBPRINT) $(LIBHELP) $(LIBWIDGET) $(LIBSVC) $(LIBTT) -lXm \ dtfile_LDADD = @DTCLIENTLIBS@ $(TIRPCLIB) -lXm -lXext \
$(XTOOLLIB) ${X_LIBS} -lXinerama dtcopy/sharedFuncs.o \ $(XTOOLLIB) ${X_LIBS} dtcopy/sharedFuncs.o \
dtcopy/fsrtns.o dtcopy/fsrtns.o
if OPENBSD if OPENBSD

3
cde/programs/dtfile/MkDir.c
View file

@ -154,7 +154,8 @@ RunFileCommand(
command_name++; command_name++;
_DtEnvControl(DT_ENV_RESTORE_PRE_DT); _DtEnvControl(DT_ENV_RESTORE_PRE_DT);
(void) execl (command_path, command_name, argument1, argument2, argument3,0); (void) execl (command_path, command_name, argument1, argument2,
argument3, (char *)NULL);
DBGFORK(("%s: child exiting\n", pname)); DBGFORK(("%s: child exiting\n", pname));

1
cde/programs/dtfile/SharedProcs.h
View file

@ -41,6 +41,7 @@
#ifndef _DtFile_SharedProcs_h #ifndef _DtFile_SharedProcs_h
#define _DtFile_SharedProcs_h #define _DtFile_SharedProcs_h
#include <Xm/XmPrivate.h>
#include <Dt/Icon.h> #include <Dt/Icon.h>
#include <Dt/Action.h> #include <Dt/Action.h>
#include <Dt/Dnd.h> #include <Dt/Dnd.h>

4
cde/programs/dtfile/dtcopy/Makefile.am
View file

@ -2,11 +2,13 @@ MAINTAINERCLEANFILES = Makefile.in
bin_PROGRAMS = dtfile_copy bin_PROGRAMS = dtfile_copy
dtfile_copy_CFLAGS = -DSHAPE dtfile_copy_CFLAGS = -DSHAPE $(TIRPCINC)
if SOLARIS if SOLARIS
dtfile_copy_CFLAGS += -xF dtfile_copy_CFLAGS += -xF
endif endif
dtfile_copy_LDADD = @DTCLIENTLIBS@ -lXm $(TIRPCLIB) $(XTOOLLIB)
dtfile_copy_SOURCES = main_dtcopy.c copydialog.c overwrtdialog.c dosync.c \ dtfile_copy_SOURCES = main_dtcopy.c copydialog.c overwrtdialog.c dosync.c \
fsrtns.c utils.c errordialog.c sharedFuncs.c fsrtns.c utils.c errordialog.c sharedFuncs.c