dtwm: fixes to make it build
Removed PORT_NOFORK define in favor of autotools vfork availablility checking. Use vfork if present. Got rid of getenv/putenv definitions in favor of including correct system headers. Use FD_CLOEXEC in fcntl() call rather than hardcoded '1'. Added -lm check to configure so dtwm will build. Renamed internal round() function to wmround() to fix warning about redefinition of builtin. Fixed missing backslash in Makefile.am that prevented half the sources from building.
This commit is contained in:
@@ -2,22 +2,20 @@ configdir = ${prefix}/config/C
|
||||
|
||||
bin_PROGRAMS = dtwm dtfplist
|
||||
|
||||
dist_config_DATA = sys.dtwmrc
|
||||
dist_config_DATA = sys.dtwmrc Dtwm.defs
|
||||
BUILT_SOURCES = sys.dtwmrc Dtwm.defs
|
||||
|
||||
AM_CPPFLAGS = -DLARGECURSORS -DR2_COMPAT -DOPAQUE -DSHAPE -DUNMAP_ON_RESTART \
|
||||
-DBATCH_DRAG_REQUESTS -DCDE_INSTALLATION_TOP=\"${prefix}\" \
|
||||
-DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \
|
||||
-I$(TIRPCINC)
|
||||
$(TIRPCINC)
|
||||
|
||||
AM_LDADD = $(LIBXIN) -lXinerama $(LIBPRINT) $(LIBHELP) $(LIBWIDGET) \
|
||||
$(LIBSVC) $(LIBTT) -lXm $(XTOOLLIB) ${X_LIBS}
|
||||
dtwm_LDADD = @DTCLIENTLIBS@ $(TIRPCLIB) -lXm -lXext $(XTOOLLIB)
|
||||
dtfplist_LDADD = @DTCLIENTLIBS@ $(TIRPCLIB) -lXm -lXext $(XTOOLLIB)
|
||||
|
||||
if SOLARIS
|
||||
AM_LDADD += -lintl -lresolv
|
||||
endif
|
||||
|
||||
if HPUX
|
||||
AM_CFLAGS += -D_HPUX_SOURCE
|
||||
dtwm_LDADD += -lintl -lresolv
|
||||
dtfplist_LDADD += -lintl -lresolv
|
||||
endif
|
||||
|
||||
dtwm_SOURCES = WmCDInfo.c WmCDecor.c WmCEvent.c \
|
||||
@@ -29,7 +27,7 @@ dtwm_SOURCES = WmCDInfo.c WmCDecor.c WmCEvent.c \
|
||||
WmMenu.c WmProperty.c WmProtocol.c \
|
||||
WmResCvt.c WmResParse.c WmResource.c \
|
||||
WmSignal.c WmWinConf.c WmWinInfo.c \
|
||||
WmWinList.c WmWinState.c WmMultiHead.c
|
||||
WmWinList.c WmWinState.c WmMultiHead.c \
|
||||
Button.c Callback.c Clock.c \
|
||||
DataBaseLoad.c PanelS.c Parse.c \
|
||||
PopupMenu.c Session.c UI.c \
|
||||
@@ -43,10 +41,12 @@ dtfplist_SOURCES = Print.c Parse.c DataBaseLoad.c WmParse.c Session.c
|
||||
SCRIPTFLAGS = -DCDE_INSTALLATION_TOP=${prefix} \
|
||||
-DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP)
|
||||
|
||||
CPPSRC = Dtwm.defs.src
|
||||
CPPTARGET = Dtwm.defs
|
||||
include $(srcdir)/include/cppfile.tmpl
|
||||
Dtwm.defs: Dtwm.defs.src
|
||||
$(RM) $@
|
||||
$(CPP) -P -DXCOMM=# $(AM_CPPFLAGS) - < $< > $@
|
||||
|
||||
CPPSRC = sys.dtwmrc.src
|
||||
CPPTARGET = sys.dtwmrc
|
||||
include $(srcdir)/include/cppfile.tmpl
|
||||
sys.dtwmrc: sys.dtwmrc.src
|
||||
$(RM) $@
|
||||
$(CPP) -P -DXCOMM=# $(AM_CPPFLAGS) - < $< > $@
|
||||
|
||||
|
||||
Reference in New Issue
Block a user