Commit e402a0f6 authored by Raja R Harinath's avatar Raja R Harinath

Use `STD_DEFINES' rather than `STD_CPP_DEFINES'. (ORB_LIBS): To replace

* configure.in (SMPROXY_DEFS): Use `STD_DEFINES' rather than
`STD_CPP_DEFINES'.
(ORB_LIBS): To replace MICO_LIBS.
(ORBIT_LIBS,MICO_LIBS): Don't subst.
(ORBIT_CONFIG): Don't use `if [ .. ];', use `if test ..;'.

* */Makefile.am: s/MICO_LIBS/ORB_LIBS/g.
* panel/appletsConf.sh.h: Likewise.

Note:
Automake seems to generate buggy Makefiles for

	if FOO
	BAR = a \
		b \
		c
	endif

I'll verify this and submit the test-case.
parent 5019897f
1998-07-19 Raja R Harinath <harinath@cs.umn.edu>
* configure.in (SMPROXY_DEFS): Use `STD_DEFINES' rather than
`STD_CPP_DEFINES'.
(ORB_LIBS): To replace MICO_LIBS.
(ORBIT_LIBS,MICO_LIBS): Don't subst.
(ORBIT_CONFIG): Don't use `if [ .. ];', use `if test ..;'.
1998-07-18 Raja R Harinath <harinath@cs.umn.edu>
* configure.in (SMPROXY_DEFS): New check, based on AC_PATH_X11.
......
1998-07-19 Raja R Harinath <harinath@cs.umn.edu>
* configure.in (SMPROXY_DEFS): Use `STD_DEFINES' rather than
`STD_CPP_DEFINES'.
(ORB_LIBS): To replace MICO_LIBS.
(ORBIT_LIBS,MICO_LIBS): Don't subst.
(ORBIT_CONFIG): Don't use `if [ .. ];', use `if test ..;'.
1998-07-18 Raja R Harinath <harinath@cs.umn.edu>
* configure.in (SMPROXY_DEFS): New check, based on AC_PATH_X11.
......
1998-07-19 Raja R Harinath <harinath@cs.umn.edu>
* */Makefile.am (*_LDADD): Change MICO_LIBS to ORB_LIBS.
1998-07-15 Raja R Harinath <harinath@cs.umn.edu>
* battery/read-battery.c (battery_read_charge): Provide fallback
......
1998-07-19 Raja R Harinath <harinath@cs.umn.edu>
* */Makefile.am (*_LDADD): Change MICO_LIBS to ORB_LIBS.
1998-07-15 Raja R Harinath <harinath@cs.umn.edu>
* battery/read-battery.c (battery_read_charge): Provide fallback
......
......@@ -24,9 +24,10 @@ gen_util_applet_SOURCES = \
gen_util_applet_LDADD = ../../panel/libpanel_applet.la \
$(GNOME_LIBDIR) $(MICO_LIBS) \
$(GNOME_LIBDIR) $(ORB_LIBS) \
$(GNOMEUI_LIBS) $(INTLLIBS)
# will go away once ORBit becomes default
gen_util_applet_LINK = $(CXXLINK)
PRINTER_BITMAPS = print.xpm
......
1998-07-19 Raja R Harinath <harinath@cs.umn.edu>
* Makefile.am (fish_applet_LDADD): s/MICO_LIBS/ORB_LIBS/g.
1998-07-04 Carsten Schaar <nhadcasc@fs-maphy.uni-hannover.de>
* fish.c (main): Now uses stock menus icons.
......
......@@ -16,7 +16,7 @@ bin_PROGRAMS = fish_applet
fish_applet_SOURCES = fish.c
fish_applet_LDADD = ../../panel/libpanel_applet.la \
$(GNOME_LIBDIR) $(MICO_LIBS) \
$(GNOME_LIBDIR) $(ORB_LIBS) \
$(GNOMEUI_LIBS) $(INTLLIBS)
fish_applet_LINK = $(CXXLINK)
......
1998-07-19 Raja R Harinath <harinath@cs.umn.edu>
* */Makefile.am (*_LDADD): Change MICO_LIBS to ORB_LIBS.
1998-07-15 Raja R Harinath <harinath@cs.umn.edu>
* battery/read-battery.c (battery_read_charge): Provide fallback
......
......@@ -24,9 +24,10 @@ gen_util_applet_SOURCES = \
gen_util_applet_LDADD = ../../panel/libpanel_applet.la \
$(GNOME_LIBDIR) $(MICO_LIBS) \
$(GNOME_LIBDIR) $(ORB_LIBS) \
$(GNOMEUI_LIBS) $(INTLLIBS)
# will go away once ORBit becomes default
gen_util_applet_LINK = $(CXXLINK)
PRINTER_BITMAPS = print.xpm
......
1998-07-19 Raja R Harinath <harinath@cs.umn.edu>
* */Makefile.am (*_LDADD): Change MICO_LIBS to ORB_LIBS.
1998-07-15 Raja R Harinath <harinath@cs.umn.edu>
* battery/read-battery.c (battery_read_charge): Provide fallback
......
......@@ -24,9 +24,10 @@ gen_util_applet_SOURCES = \
gen_util_applet_LDADD = ../../panel/libpanel_applet.la \
$(GNOME_LIBDIR) $(MICO_LIBS) \
$(GNOME_LIBDIR) $(ORB_LIBS) \
$(GNOMEUI_LIBS) $(INTLLIBS)
# will go away once ORBit becomes default
gen_util_applet_LINK = $(CXXLINK)
PRINTER_BITMAPS = print.xpm
......
1998-07-19 Raja R Harinath <harinath@cs.umn.edu>
* */Makefile.am (*_LDADD): Change MICO_LIBS to ORB_LIBS.
1998-07-15 Raja R Harinath <harinath@cs.umn.edu>
* battery/read-battery.c (battery_read_charge): Provide fallback
......
......@@ -37,19 +37,6 @@ AC_SUBST(CFLAGS)
AC_SUBST(CPPFLAGS)
AC_SUBST(LDFLAGS)
for dir in `(IFS=:; for i in $PATH; do echo $i ; done)` ; do
if test -f $dir/orbit-idl ; then
orbit_prefix=`echo $dir | sed 's%/bin$%%' |sed 's%/bin/$%%'`
break
fi
done
AC_CHECK_PROG(ORBIT_CONFIG, orbit-config, orbit-config)
if [ ! -z "$ORBIT_CONFIG" ]; then
ORBIT_LIBS="`orbit-config --libs client server`"
ORBIT_CFLAGS="`orbit-config --cflags client server`"
fi
AC_SUBST(ORBIT_LIBS)
AM_CONDITIONAL(ORBIT_INSTALLED, test ! -z "$ORBIT_LIBS")
AC_CHECK_HEADERS(dlfcn.h dl.h)
AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl",[
......@@ -64,67 +51,84 @@ dnl properties-keyboard
AC_CHECK_HEADERS(X11/extensions/xf86misc.h, XF86MISC_LIBS="-lXxf86misc")
AC_SUBST(XF86MISC_LIBS)
dnl MICO - Magic to extract the relevant information from
dnl various installed files
if test -z "$ORBIT_LIBS"; then
AC_MSG_CHECKING(for MICO prefix)
for dir in `(IFS=:; for i in $PATH; do echo $i ; done)` ; do
if test -f $dir/mico-ld ; then
mico_prefix=`echo $dir | sed 's%/bin$%%' |sed 's%/bin/$%%'`
if test -f $dir/orbit-idl ; then
orbit_prefix=`echo $dir | sed 's%/bin$%%' |sed 's%/bin/$%%'`
break
fi
done
if test x${mico_prefix+set} = xset ; then
AC_MSG_RESULT($mico_prefix)
else
AC_MSG_RESULT(not found)
AC_MSG_ERROR(MICO not found)
AC_CHECK_PROG(ORBIT_CONFIG, orbit-config, orbit-config)
if test -n "$ORBIT_CONFIG"; then
ORBIT_LIBS="`orbit-config --libs client server`"
ORBIT_CFLAGS="`orbit-config --cflags client server`"
fi
AC_SUBST(ORBIT_CFLAGS)
AC_SUBST(ORBIT_LIBS)
AM_CONDITIONAL(ORBIT_INSTALLED, test -n "$ORBIT_LIBS")
AC_MSG_CHECKING(for MICO version)
if test -f "$mico_prefix/lib/mico-setup.sh"; then
MICO_VERS=`(. $mico_prefix/lib/mico-setup.sh ; echo $MICOVERSION)`
else
# Sometimes mico-setup.sh is installed in doc.
files="`echo $mico_prefix/doc/mico-*/mico-setup.sh`"
if test "$files" != "$mico_prefix/doc/mico-*/mico-setup.sh"; then
MICO_VERS=`(set X $files; . $2; echo $MICOVERSION)`
else
AC_MSG_ERROR(unknown)
fi
fi
AC_MSG_RESULT($MICO_VERS)
ORB_LIBS="$ORBIT_LIBS"
ORB_CFLAGS="$ORBIT_CFLAGS"
# We assume here, to keep things simple, that nobody has MICO older
# than 2.0.3. 2.0.4 is not checked for since nobody seems to use it.
dnl MICO - Magic to extract the relevant information from
dnl various installed files
MICO_LIBS= MICO_CFLAGS=
if test -z "$ORB_LIBS"; then
AC_MSG_CHECKING(for MICO prefix)
for dir in `(IFS=:; for i in $PATH; do echo $i ; done)` ; do
if test -f $dir/mico-ld ; then
mico_prefix=`echo $dir | sed 's%/bin$%%' |sed 's%/bin/$%%'`
break
fi
done
if test x${mico_prefix+set} = xset ; then
AC_MSG_RESULT($mico_prefix)
else
AC_MSG_RESULT(not found)
AC_MSG_ERROR(MICO not found)
fi
if test $MICO_VERS = 2.0.3 || test $MICO_VERS = 2.0.5; then
MICO_LIBS="-lmicoaux$MICO_VERS -lmico$MICO_VERS -lmicocoss$MICO_VERS -lXt"
else
MICO_LIBS="-lmico$MICO_VERS -lmicogtk$MICO_VERS"
AC_DEFINE(HAVE_MICO_ORB_RUN)
fi
AC_MSG_CHECKING(for MICO version)
if test -f "$mico_prefix/lib/mico-setup.sh"; then
MICO_VERS=`(. $mico_prefix/lib/mico-setup.sh ; echo $MICOVERSION)`
else
# Sometimes mico-setup.sh is installed in doc.
files="`echo $mico_prefix/doc/mico-*/mico-setup.sh`"
if test "$files" != "$mico_prefix/doc/mico-*/mico-setup.sh"; then
MICO_VERS=`(set X $files; . $2; echo $MICOVERSION)`
else
AC_MSG_ERROR(unknown)
fi
fi
AC_MSG_RESULT($MICO_VERS)
for flag in `grep '^eval' < $mico_prefix/bin/mico-ld | sed s%\"%%g` ; do
case $flag in
-L*)
MICO_LIBS="$flag $MICO_LIBS"
;;
-lm|-ldl|-ldld|-lbsd)
;;
-l*)
MICO_LIBS="$MICO_LIBS $flag"
;;
esac
done
else
MICO_LIBS="$ORBIT_LIBS"
MICO_VERS=""
# We assume here, to keep things simple, that nobody has MICO older
# than 2.0.3. 2.0.4 is not checked for since nobody seems to use it.
if test $MICO_VERS = 2.0.3 || test $MICO_VERS = 2.0.5; then
MICO_LIBS="-lmicoaux$MICO_VERS -lmico$MICO_VERS -lmicocoss$MICO_VERS -lXt"
else
MICO_LIBS="-lmico$MICO_VERS -lmicogtk$MICO_VERS"
AC_DEFINE(HAVE_MICO_ORB_RUN)
fi
for flag in `grep '^eval' < $mico_prefix/bin/mico-ld | sed s%\"%%g` ; do
case $flag in
-L*)
MICO_LIBS="$flag $MICO_LIBS"
;;
-lm|-ldl|-ldld|-lbsd)
;;
-l*)
MICO_LIBS="$MICO_LIBS $flag"
;;
esac
done
ORB_LIBS="$MICO_LIBS"
ORB_CFLAGS="$MICO_CFLAGS"
fi
AC_SUBST(MICO_LIBS)
AC_SUBST(MICO_VERS)
AC_SUBST(ORB_LIBS)
AC_SUBST(ORB_CFLAGS)
dnl gnome-session
dnl $GNOME_HAVE_SM comes from GNOME_X_CHECKS
......@@ -142,12 +146,13 @@ SMPROXY_DEFS=
rm -fr conftestdir
if mkdir conftestdir; then
cd conftestdir
# STD_CPP_DEFINES is in the Makefiles generated with X11R6/6.1/6.3
# STD_DEFINES is in the Makefiles generated with X11R6/6.1/6.3
# and Solaris 2.5 OpenWindows `xmkmf's. I haven't tested with
# older versions. FIXME if necessary.
# older versions. FIXME if necessary. Alternative may be
# $(ALLDEFINES).
cat > Imakefile <<'EOF'
acfinddefs:
@echo 'ac_x_cpp_defs="${STD_CPP_DEFINES}"'
@echo 'ac_x_cpp_defs="${STD_DEFINES}"'
EOF
if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
......
1998-07-19 Raja R Harinath <harinath@cs.umn.edu>
* Makefile.am (panel_LDADD): s/MICO_LIBS/ORB_LIBS/g.
* appletsConf.sh.in (APPLETS_LIBS): s/MICO_LIBS/ORB_LIBS/g.
Sat Jul 18 16:17:18 1998 George Lebl <jirka@5z.com>
* launcher.[ch]: make use of gnome-dentry-edit, plus some
......
1998-07-19 Raja R Harinath <harinath@cs.umn.edu>
* Makefile.am (panel_LDADD): s/MICO_LIBS/ORB_LIBS/g.
* appletsConf.sh.in (APPLETS_LIBS): s/MICO_LIBS/ORB_LIBS/g.
Sat Jul 18 16:17:18 1998 George Lebl <jirka@5z.com>
* launcher.[ch]: make use of gnome-dentry-edit, plus some
......
......@@ -3,24 +3,20 @@
## We require new-style dependency handling.
AUTOMAKE_OPTIONS = 1.2f
CFLAGS += $(ORBIT_CFLAGS)
if ORBIT_INSTALLED
CXX = $(CC)
# nothing
else
CXX = mico-c++
endif
## We set this to force the values in mico-c++ to be used. Otherwise,
## on Linux boxes, the compilation will fail with the default
## CXXFLAGS.
CXXFLAGS =
test:
echo $(CXXCOMPILE)
panel_LINK = $(CXXLINK)
endif
INCLUDES = -I. -I$(srcdir) \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-I$(includedir) $(GNOME_INCLUDEDIR)
-I$(includedir) $(GNOME_INCLUDEDIR) $(ORB_CFLAGS)
bin_PROGRAMS = panel #launcher_applet
......@@ -29,15 +25,29 @@ libpanel_appletincludedir = $(includedir)
lib_LTLIBRARIES = libpanel_applet.la
if ORBIT_INSTALLED
CORBA_SRCLIST = gnome-panel-stubs.c gnome-panel-skels.c gnome-panel-common.c gnome-panel.h
$(CORBA_SRCLIST): gnome-panel.idl
orbit-idl $(srcdir)/gnome-panel.idl
APPLET_LIB = orbit-applet-lib.c
PANEL_ORB_SRCLIST= orbit-glue.c mico-glue.h
else
CORBA_SRCLIST = gnome-panel.cc gnome-panel.h
endif
if ORBIT_INSTALLED
APPLET_LIB=orbit-applet-lib.c
else
gnome-panel.cc gnome-panel.h: gnome-panel.idl
## `idl' lamely fails to strip the path part of the file
## name when computing the name of the output file, so we prod it a
## little.
idl --name gnome-panel $(srcdir)/gnome-panel.idl
APPLET_LIB=applet-lib.cc mico-parse.cc mico-parse.h
PANEL_ORB_SRCLIST= mico-glue.cc mico-glue.h mico-parse.cc mico-parse.h
endif
libpanel_applet_la_SOURCES = \
......@@ -46,38 +56,16 @@ libpanel_applet_la_SOURCES = \
panel-util.h \
applet-widget.c \
$(CORBA_SRCLIST)
#else
libpanel_appletinclude_HEADERS = \
applet-lib.h \
applet-widget.h
libpanel_applet_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
libpanel_applet_la_LIBADD = $(MICO_LIBS) -lm $(DL_LIB)
libpanel_applet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB)
BUILT_SOURCES = $(CORBA_SRCLIST)
if ORBIT_INSTALLED
$(CORBA_SRCLIST): gnome-panel.idl
orbit-idl $(srcdir)/gnome-panel.idl
else
gnome-panel.cc gnome-panel.h: gnome-panel.idl
## `idl' lamely fails to strip the path part of the file
## name when computing the name of the output file, so we prod it a
## little.
idl --name gnome-panel $(srcdir)/gnome-panel.idl
endif
if ORBIT_INSTALLED
PANEL_ORB_SRCLIST= orbit-glue.c \
mico-glue.h
else
PANEL_ORB_SRCLIST= mico-glue.cc \
mico-glue.h \
mico-parse.cc \
mico-parse.h
endif
panel_SOURCES = \
drawer.c \
drawer.h \
......@@ -116,13 +104,6 @@ panel_SOURCES = \
logout.h \
$(CORBA_SRCLIST)
if ORBIT_INSTALLED
ORB_LIBS=$(ORBIT_LIBS)
MICO_LIBS=$(ORBIT_LIBS)
else
ORB_LIBS=$(MICO_LIBS)
endif
panel_LDADD = $(GNOME_LIBDIR) $(ORB_LIBS) $(GNOMEUI_LIBS) $(INTLLIBS)
data_DATA = panelrc
......@@ -154,20 +135,11 @@ confexec_DATA = appletsConf.sh
#
# Create the appletsConf.sh file from the .sh.in file
#
if ORBIT_INSTALLED
appletsConf.sh: appletsConf.sh.in Makefile
sed -e 's,\@GNOME_LIBDIR\@,$(GNOME_LIBDIR),g' \
-e 's,\@GNOMEUI_LIBS\@,$(GNOMEUI_LIBS),g' \
-e 's,\@GNOME_INCLUDEDIR\@,$(GNOME_INCLUDEDIR),g' \
-e 's,\@ORBIT_LIBS\@,$(ORBIT_LIBS),g' \
< $(srcdir)/appletsConf.sh.in > appletsConf.tmp \
&& mv appletsConf.tmp appletsConf.sh
else
appletsConf.sh: appletsConf.sh.in Makefile
sed -e 's,\@GNOME_LIBDIR\@,$(GNOME_LIBDIR),g' \
-e 's,\@GNOMEUI_LIBS\@,$(GNOMEUI_LIBS),g' \
-e 's,\@GNOME_INCLUDEDIR\@,$(GNOME_INCLUDEDIR),g' \
-e 's,\@MICO_LIBS\@,$(MICO_LIBS),g' \
-e 's,\@ORB_LIBS\@,$(ORB_LIBS),g' \
< $(srcdir)/appletsConf.sh.in > appletsConf.tmp \
&& mv appletsConf.tmp appletsConf.sh
endif
......@@ -2,5 +2,5 @@
# Configuration file for creating GNOME panel applets
#
APPLETS_LIBDIR="@GNOME_LIBDIR@"
APPLETS_LIBS="@GNOMEUI_LIBS@ @MICO_LIBS@"
APPLETS_LIBS="@GNOMEUI_LIBS@ @ORB_LIBS@"
APPLETS_INCLUDEDIR="@GNOME_INCLUDEDIR@"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment