mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-03-09 15:50:02 +00:00
dtlogin/dtgreet/dtchooser: get them to build
That was not fun. There were a variety of issues. It's needs testing. We use the new GENCPP for preprocessing the various scripts and config files in config/
This commit is contained in:
Jon Trulson
parent
2b8803a8fb
commit
3f8c84b752
2 changed files with 150 additions and 23 deletions
|
|
@ -11,42 +11,50 @@ CPP_PROGRAM = $(CPP)
|
|||
DEF_BM_PATH = $(CDE_CONFIGURATION_TOP)/appconfig/icons/%L/%B%M.bm:$(CDE_CONFIGURATION_TOP)/appconfig/icons/%L/%B%M.pm:$(CDE_CONFIGURATION_TOP)/appconfig/icons/%L/%B:$(CDE_CONFIGURATION_TOP)/appconfig/icons/C/%B%M.bm:$(CDE_CONFIGURATION_TOP)/appconfig/icons/C/%B%M.pm:$(CDE_CONFIGURATION_TOP)/appconfig/icons/C/%B:${prefix}/appconfig/icons/%L/%B%M.bm:${prefix}/appconfig/icons/%L/%B%M.pm:${prefix}/appconfig/icons/%L/%B:${prefix}/appconfig/icons/C/%B%M.bm:${prefix}/appconfig/icons/C/%B%M.pm:${prefix}/appconfig/icons/C/%B
|
||||
DEF_PM_PATH = $(CDE_CONFIGURATION_TOP)/appconfig/icons/%L/%B%M.pm:$(CDE_CONFIGURATION_TOP)/appconfig/icons/%L/%B%M.bm:$(CDE_CONFIGURATION_TOP)/appconfig/icons/%L/%B:$(CDE_CONFIGURATION_TOP)/appconfig/icons/C/%B%M.pm:$(CDE_CONFIGURATION_TOP)/appconfig/icons/C/%B%M.bm:$(CDE_CONFIGURATION_TOP)/appconfig/icons/C/%B:${prefix}/appconfig/icons/%L/%B%M.pm:${prefix}/appconfig/icons/%L/%B%M.bm:${prefix}/appconfig/icons/%L/%B:${prefix}/appconfig/icons/C/%B%M.pm:${prefix}/appconfig/icons/C/%B%M.bm:${prefix}/appconfig/icons/C/%B
|
||||
|
||||
dtlogin_CFLAGS = -DDEF_SESSION="${prefix}/bin/Xsession" \
|
||||
-DDEF_SYSTEM_SHELL="/bin/sh" \
|
||||
-DDEF_CHOOSER="${prefix}/bin/dtchooser" \
|
||||
-DDEF_XDM_CONFIG="Xconfig" -DSIGNALRETURNSINT \
|
||||
-DDEF_SERVER_LINE=":0 Local local $(DEF_SERVER) :0" \
|
||||
-DXRDB_PROGRAM="$(XBINDIR)/xrdb" \
|
||||
-DDEF_USER_PATH="$(DEF_USER_PATH)" \
|
||||
-DDEF_SYSTEM_PATH="$(DEF_SYSTEM_PATH)" \
|
||||
-DDEF_FAILSAFE_CLIENT="$(XBINDIR)/xterm" \
|
||||
-DDEF_AUTH_FILE="$(XDMDIR)/auth-server" \
|
||||
-DDEF_AUTH_DIR="$(XDMDIR)" \
|
||||
-DCPP_PROGRAM="$(CPP_PROGRAM)" \
|
||||
-DDEF_PM_SEARCH_PATH="$(DEF_PM_PATH)" \
|
||||
-DDEF_BM_SEARCH_PATH="$(DEF_BM_PATH)"
|
||||
|
||||
AM_CFLAGS = -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
|
||||
-DCDE_INSTALLATION_TOP=${prefix} \
|
||||
-DCDE_LOGFILES_TOP=$(CDE_LOGFILES_TOP \
|
||||
AM_CFLAGS = -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \
|
||||
-DCDE_INSTALLATION_TOP=\"${prefix}\" \
|
||||
-DCDE_LOGFILES_TOP=\"$(CDE_LOGFILES_TOP)\" \
|
||||
-I/usr/include/freetype2 -DBINDIR=\"$(XBINDIR)\" \
|
||||
-DXDMDIR=\"$(XDMDIR)\" $(TIRPCINC) \
|
||||
-DKORNSHELL=$(KSH) -DUNIXCONN -DTCPCONN -DXDMCP
|
||||
|
||||
dtlogin_SOURCES = access.c account.c auth.c genauth.c daemon.c dm.c \
|
||||
dpylist.c error.c file.c mitauth.c protodpy.c policy.c \
|
||||
reset.c resource.c server.c session.c socket.c util.c \
|
||||
reset.c server.c session.c socket.c util.c \
|
||||
verify.c sysauth.c fontpath.c qualify.c choose.c netaddr.c \
|
||||
xdmcp.c
|
||||
|
||||
# We play a game here with resources.o (dtlogin). It needs special options.
|
||||
noinst_LIBRARIES = libresource.a
|
||||
libresource_a_SOURCES = resource.c
|
||||
libresource_a_CFLAGS = $(AM_CFLAGS) \
|
||||
-DDEF_SESSION=\"${prefix}/bin/Xsession\" \
|
||||
-DDEF_SYSTEM_SHELL=\"/bin/sh\" \
|
||||
-DDEF_CHOOSER=\"${prefix}/bin/dtchooser\" \
|
||||
-DDEF_XDM_CONFIG=\"Xconfig\" -DSIGNALRETURNSINT \
|
||||
-DDEF_SERVER_LINE=\"":0 Local local $(DEF_SERVER) :0"\" \
|
||||
-DXRDB_PROGRAM=\"$(XBINDIR)/xrdb\" \
|
||||
-DDEF_USER_PATH=\"$(DEF_USER_PATH)\" \
|
||||
-DDEF_SYSTEM_PATH=\"$(DEF_SYSTEM_PATH)\" \
|
||||
-DDEF_FAILSAFE_CLIENT=\"$(XBINDIR)/xterm\" \
|
||||
-DDEF_AUTH_FILE=\"$(XDMDIR)/auth-server\" \
|
||||
-DDEF_AUTH_DIR=\"$(XDMDIR)\" \
|
||||
-DCPP_PROGRAM=\""$(CPP_PROGRAM)"\" \
|
||||
-DDEF_PM_SEARCH_PATH=\"$(DEF_PM_PATH)\" \
|
||||
-DDEF_BM_SEARCH_PATH=\"$(DEF_BM_PATH)\"
|
||||
|
||||
dtgreet_SOURCES = vgcallback.c vglogo.c vgmain.c vgutil.c vglang.c
|
||||
|
||||
dtchooser_SOURCES = chooser.c dtchooser.c vglogo.c vgutil.c vgcallback.c \
|
||||
vglang.c
|
||||
|
||||
dtlogin_LDADD = @DTCLIENTLIBS@ $(XTOOLLIB)
|
||||
dtgreet_LDADD = @DTCLIENTLIBS@ $(XTOOLLIB)
|
||||
dtchooser_LDADD = @DTCLIENTLIBS@ $(XTOOLLIB)
|
||||
dtlogin_LDADD = libresource.a @DTCLIENTLIBS@ -lXau -lXmu -lXext -lXdmcp \
|
||||
$(XTOOLLIB) $(TIRPCLIB)
|
||||
|
||||
dtgreet_LDADD = -lXm @DTCLIENTLIBS@ $(XTOOLLIB) $(TIRPCLIB)
|
||||
|
||||
dtchooser_LDADD = -lXm @DTCLIENTLIBS@ -lXau -lXmu -lXext -lXdmcp $(XTOOLLIB) \
|
||||
$(TIRPCLIB)
|
||||
|
||||
|
||||
if LINUX
|
||||
|
|
@ -61,7 +69,7 @@ endif
|
|||
|
||||
if OPENBSD
|
||||
XBINDIR = /usr/X11R6/bin
|
||||
dtlogin_CFLAGS += -DHASDES
|
||||
AM_CFLAGS += -DHASDES
|
||||
dtlogin_SOURCES += xdmauth.c
|
||||
endif
|
||||
|
||||
|
|
|
|||
119
cde/programs/dtlogin/config/Makefile.am
Normal file
119
cde/programs/dtlogin/config/Makefile.am
Normal file
|
|
@ -0,0 +1,119 @@
|
|||
|
||||
AM_CPPFLAGS = -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
|
||||
-DCDE_INSTALLATION_TOP=${prefix} \
|
||||
-DCDE_LOGFILES_TOP=$(CDE_LOGFILES_TOP) \
|
||||
-DKORNSHELL=$(KSH)
|
||||
|
||||
if FREEBSD
|
||||
AM_CPPFLAGS += -DFREEBSD
|
||||
endif
|
||||
|
||||
CPP_TARGETS = \
|
||||
0060.dtsysenv Dtlogin \
|
||||
Xaccess Xconfig \
|
||||
Xconfig.con Xconfig.nc \
|
||||
Xfailsafe Xreset \
|
||||
Xresources Xresources.ive \
|
||||
Xservers Xservers.con \
|
||||
Xservers.nc Xsession \
|
||||
Xsession.ive Xsetup \
|
||||
Xstartup current.session \
|
||||
display.current.session display.home.session \
|
||||
dtlslocale dtprofile \
|
||||
home.session
|
||||
|
||||
BUILT_SOURCES = $(CPP_TARGETS)
|
||||
CLEANFILES = $(CPP_TARGETS)
|
||||
|
||||
0060.dtsysenv: 0060.dtsysenv.src
|
||||
$(RM) $@
|
||||
$(GENCPP) -P -DXCOMM=# $(AM_CPPFLAGS) $< > $@
|
||||
|
||||
Dtlogin: Dtlogin.src
|
||||
$(RM) $@
|
||||
$(GENCPP) -P -DXCOMM=# $(AM_CPPFLAGS) $< > $@
|
||||
|
||||
Xaccess: Xaccess.src
|
||||
$(RM) $@
|
||||
$(GENCPP) -P -DXCOMM=# $(AM_CPPFLAGS) $< > $@
|
||||
|
||||
Xconfig: Xconfig.src
|
||||
$(RM) $@
|
||||
$(GENCPP) -P -DXCOMM=# $(AM_CPPFLAGS) $< > $@
|
||||
|
||||
Xconfig.con: Xconfig.src
|
||||
$(RM) $@
|
||||
$(GENCPP) -P -DXCOMM=# $(AM_CPPFLAGS) $< > $@
|
||||
|
||||
Xconfig.nc: Xconfig.src
|
||||
$(RM) $@
|
||||
$(GENCPP) -P -DXCOMM=# $(AM_CPPFLAGS) -DNO_CONSOLE $< > $@
|
||||
|
||||
Xfailsafe: Xfailsafe.src
|
||||
$(RM) $@
|
||||
$(GENCPP) -P -DXCOMM=# $(AM_CPPFLAGS) $< > $@
|
||||
|
||||
Xreset: Xreset.src
|
||||
$(RM) $@
|
||||
$(GENCPP) -P -DXCOMM=# $(AM_CPPFLAGS) $< > $@
|
||||
|
||||
Xresources: Xresources.src
|
||||
$(RM) $@
|
||||
$(GENCPP) -P -DXCOMM=# $(AM_CPPFLAGS) $< > $@
|
||||
|
||||
Xresources.ive: Xresources.src
|
||||
$(RM) $@
|
||||
$(GENCPP) -P -DXCOMM=# $(AM_CPPFLAGS) -DIVE $< > $@
|
||||
|
||||
Xservers: Xservers.src
|
||||
$(RM) $@
|
||||
$(GENCPP) -P -DXCOMM=# $(AM_CPPFLAGS) $< > $@
|
||||
|
||||
Xservers.con: Xservers.src
|
||||
$(RM) $@
|
||||
$(GENCPP) -P -DXCOMM=# $(AM_CPPFLAGS) $< > $@
|
||||
|
||||
Xservers.nc: Xservers.src
|
||||
$(RM) $@
|
||||
$(GENCPP) -P -DXCOMM=# $(AM_CPPFLAGS) -DNO_CONSOLE $< > $@
|
||||
|
||||
Xsession: Xsession.src
|
||||
$(RM) $@
|
||||
$(GENCPP) -P -DXCOMM=# $(AM_CPPFLAGS) $< > $@
|
||||
|
||||
Xsession.ive: Xsession.src
|
||||
$(RM) $@
|
||||
$(GENCPP) -P -DXCOMM=# $(AM_CPPFLAGS) -DIVE $< > $@
|
||||
|
||||
Xsetup: Xsetup.src
|
||||
$(RM) $@
|
||||
$(GENCPP) -P -DXCOMM=# $(AM_CPPFLAGS) $< > $@
|
||||
|
||||
Xstartup: Xstartup.src
|
||||
$(RM) $@
|
||||
$(GENCPP) -P -DXCOMM=# $(AM_CPPFLAGS) $< > $@
|
||||
|
||||
current.session: current.session.src
|
||||
$(RM) $@
|
||||
$(GENCPP) -P -DXCOMM=# $(AM_CPPFLAGS) $< > $@
|
||||
|
||||
display.current.session: display.current.session.src
|
||||
$(RM) $@
|
||||
$(GENCPP) -P -DXCOMM=# $(AM_CPPFLAGS) $< > $@
|
||||
|
||||
display.home.session: display.home.session.src
|
||||
$(RM) $@
|
||||
$(GENCPP) -P -DXCOMM=# $(AM_CPPFLAGS) $< > $@
|
||||
|
||||
dtlslocale: dtlslocale.src
|
||||
$(RM) $@
|
||||
$(GENCPP) -P -DXCOMM=# $(AM_CPPFLAGS) $< > $@
|
||||
|
||||
dtprofile: dtprofile.src
|
||||
$(RM) $@
|
||||
$(GENCPP) -P -DXCOMM=# $(AM_CPPFLAGS) $< > $@
|
||||
|
||||
home.session: home.session.src
|
||||
$(RM) $@
|
||||
$(GENCPP) -P -DXCOMM=# $(AM_CPPFLAGS) $< > $@
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue