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

dtstyle: make it build

Browse source
This commit is contained in:
Jon Trulson 2019-11-19 18:17:34 -07:00
parent af20bc2b57
commit 1b8ef6a6c1
3 changed files with 38 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cde/configure.ac
View file

@ -270,12 +270,14 @@ AC_SUBST(TIRPCINC)
AC_SUBST(TIRPCLIB) AC_SUBST(TIRPCLIB)
AC_CHECK_LIB(Xinerama, XineramaQueryScreens, ,[AC_MSG_ERROR([libXinerama not found])]) AC_CHECK_LIB(Xinerama, XineramaQueryScreens, ,[AC_MSG_ERROR([libXinerama not found])])
dnl Setup XTOOLLIB dnl Setup XTOOLLIB - we do it in this specific order to avoid ordering
XTOOLLIB="" dnl issues
XTOOLLIB="$X_LIBS"
AC_CHECK_LIB(X11, XOpenDisplay, [XTOOLLIB="-lX11"]) AC_CHECK_LIB(X11, XOpenDisplay, [XTOOLLIB="-lX11"])
AC_CHECK_LIB(Xt, XtInitialize, [XTOOLLIB="-lXt ${XTOOLLIB}"]) AC_CHECK_LIB(Xt, XtInitialize, [XTOOLLIB="-lXt ${XTOOLLIB}"])
AC_CHECK_LIB(ICE, IceCloseConnection, [XTOOLLIB="-lICE ${XTOOLLIB}"]) AC_CHECK_LIB(ICE, IceCloseConnection, [XTOOLLIB="-lICE ${XTOOLLIB}"])
AC_CHECK_LIB(SM, SmcOpenConnection, [XTOOLLIB="-lSM ${XTOOLLIB}"]) AC_CHECK_LIB(SM, SmcOpenConnection, [XTOOLLIB="-lSM ${XTOOLLIB}"])
AC_CHECK_LIB(Xm, XmTextSetString, [XTOOLLIB="-lXm ${XTOOLLIB}"])
AC_SUBST([XTOOLLIB]) AC_SUBST([XTOOLLIB])
dnl Add -DUSE_XINERAMA to SOURCE_CPP_DEFINES for now. Eventually this dnl Add -DUSE_XINERAMA to SOURCE_CPP_DEFINES for now. Eventually this
@ -390,6 +392,8 @@ programs/dtsession/Makefile
programs/dthello/Makefile programs/dthello/Makefile
programs/dtstyle/Makefile
]) ])
AC_OUTPUT AC_OUTPUT

2
cde/programs/dtstyle/I18nEnv.c
View file

@ -50,7 +50,7 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Intrinsic.h> #include <X11/Intrinsic.h>
#include <DtHelp/LocaleXlate.h> /* for locale equivalence between platforms */ #include <Dt/LocaleXlate.h> /* for locale equivalence between platforms */
#include "Main.h" #include "Main.h"
#include "I18nEnv.h" #include "I18nEnv.h"

57
cde/programs/dtstyle/Makefile.am
View file

@ -2,39 +2,44 @@ MAINTAINERCLEANFILES = Makefile.in
bin_PROGRAMS = dtstyle bin_PROGRAMS = dtstyle
noinst_PROGRAMS = Dtstyle Dtstyle.iso Backdrops Backdrops.iso Palettes \ dtstyle_CPPFLAGS = -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \
Palettes.iso -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" -I../dthelp \
-I$(DT_INCDIR) $(TIRPCINC)
dtstyle_CPPFLAGS = -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \ dtstyle_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
-DCDE_INSTALLATION_TOP=\"${prefix}\" -I../dthelp $(TIRPCINC)
dtstyle_LDADD = $(LIBPRINT) $(LIBHELP) $(LIBWIDGET) $(LIBSVC) $(LIBTT) \ dtstyle_SOURCES = Main.c MainWin.c Font.c Audio.c Startup.c Mouse.c \
-lm $(XTOOLLIB) ${X_LIBS} SaveRestore.c Backdrop.c Screen.c Keyboard.c \
ColorMain.c ColorPalette.c ColorFile.c ColorEdit.c \
if AIX Resource.c Protocol.c Dtwm.c Help.c HelpCB.c \
dtstyle_CFLAGS += -DANSICPP -Aa -D_POSIX_SOURCE I18nMain.c I18nEnv.c I18nUtil.c Audio.h ColorMain.h \
endif Help.h Keyboard.h OWsync.h Screen.h Backdrop.h \
ColorPalette.h I18nEnv.h Main.h Protocol.h \
Startup.h ColorEdit.h Dtwm.h I18nMain.h MainWin.h \
Resource.h ColorFile.h Font.h I18nUtil.h Mouse.h \
SaveRestore.h
if SOLARIS if SOLARIS
EXTRA_SRC = OWsync.c dtstyle_SOURCES += OWsync.c
endif endif
dtstyle_SOURCES = Main.c MainWin.c Font.c Audio.c \ LOCAL_CPP_DEFINES = -DCDE_INSTALLATION_TOP=${prefix}
Startup.c Mouse.c SaveRestore.c Backdrop.c Screen.c \
Keyboard.c ColorMain.c ColorPalette.c ColorFile.c \
ColorEdit.c Resource.c Protocol.c Dtwm.c Help.c HelpCB.c \
I18nMain.c I18nEnv.c I18nUtil.c $(EXTRA_SRC)
SCRIPTFLAGS = -DCDE_INSTALLATION_TOP=${prefix} CPP_TARGETS = Dtstyle Backdrops Palettes
CPPTARGET = Dtstyle BUILT_SOURCES = $(CPP_TARGETS)
CPPSRC = Dtstyle.src CLEANFILES = $(CPP_TARGETS)
include $(srcdir)/include/cppfile.tmpl
Dtstyle: Dtstyle.src
$(RM) $@
$(GENCPP) -P -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
Backdrops: Backdrops.src
$(RM) $@
$(GENCPP) -P -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
Palettes: Palettes.src
$(RM) $@
$(GENCPP) -P -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
CPPTARGET = Palettes
CPPSRC = Palettes.src
include $(srcdir)/include/cppfile.tmpl
CPPTARGET = Backdrops
CPPSRC = Backdrops.src
include $(srcdir)/include/cppfile.tmpl