[Gnupos-cvs] quick-gui/m4 Makefile,1.1.1.1,1.2 Makefile.in,1.2,1.3
Status: Pre-Alpha
Brought to you by:
conrad_c
From: <con...@us...> - 2003-01-14 11:54:00
|
Update of /cvsroot/gnupos/quick-gui/m4 In directory sc8-pr-cvs1:/tmp/cvs-serv28443/m4 Modified Files: Makefile Makefile.in Log Message: Now compiles and works. 0.5 here we come! Index: Makefile =================================================================== RCS file: /cvsroot/gnupos/quick-gui/m4/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Makefile 9 Jan 2003 13:36:19 -0000 1.1.1.1 --- Makefile 14 Jan 2003 11:53:56 -0000 1.2 *************** *** 41,45 **** top_builddir = .. ! ACLOCAL = aclocal -I /usr/local/share/aclocal -I macros AUTOCONF = autoconf AUTOMAKE = automake --- 41,45 ---- top_builddir = .. ! ACLOCAL = aclocal -I /usr/local/share/aclocal -I macros -I /usr/local/share/aclocal -I /usr/share/aclocal AUTOCONF = autoconf AUTOMAKE = automake *************** *** 61,74 **** host_triplet = i686-pc-linux-gnu AMTAR = tar AWK = gawk - BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ - CATOBJEXT = @CATOBJEXT@ CC = gcc - DATADIRNAME = @DATADIRNAME@ DEPDIR = .deps EXEEXT = - GENCAT = @GENCAT@ - GLIBC21 = @GLIBC21@ - GMSGFMT = /usr/bin/msgfmt GNOMEGNORBA_LIBS = -rdynamic -lgnorba -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -ldl -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib GNOMEUI_LIBS = -rdynamic -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -ldl -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib --- 61,71 ---- host_triplet = i686-pc-linux-gnu AMTAR = tar + AS = @AS@ AWK = gawk CC = gcc DEPDIR = .deps + DLLTOOL = @DLLTOOL@ + ECHO = echo EXEEXT = GNOMEGNORBA_LIBS = -rdynamic -lgnorba -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -ldl -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib GNOMEUI_LIBS = -rdynamic -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -ldl -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib *************** *** 86,104 **** GTK_CONFIG = /usr/bin/gtk-config GTK_LIBS = -lSM -lICE -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm - HAVE_LIB = @HAVE_LIB@ INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s ! INSTOBJEXT = @INSTOBJEXT@ ! INTLBISON = @INTLBISON@ ! INTLLIBS = ! INTLOBJS = @INTLOBJS@ ! INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LIB = @LIB@ ! LIBICONV = ! LIBINTL = ! LTLIB = @LTLIB@ ! LTLIBICONV = ! LTLIBINTL = MAKEINFO = makeinfo ! MKINSTALLDIRS = ./mkinstalldirs OBJEXT = o ORBIT_CFLAGS = -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include/orbit-1.0 --- 83,91 ---- GTK_CONFIG = /usr/bin/gtk-config GTK_LIBS = -lSM -lICE -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s ! LIBTOOL = $(SHELL) $(top_builddir)/libtool ! LN_S = ln -s MAKEINFO = makeinfo ! OBJDUMP = @OBJDUMP@ OBJEXT = o ORBIT_CFLAGS = -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include/orbit-1.0 *************** *** 107,115 **** ORBIT_LIBS = -L/usr/lib -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib -lm PACKAGE = quick-gui - POSUB = po PTHREAD_LIB = -lpthread ! RANLIB = @RANLIB@ ! USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ ! USE_NLS = yes VERSION = 0.1 XPM_LIBS = -lXpm --- 94,100 ---- ORBIT_LIBS = -L/usr/lib -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib -lm PACKAGE = quick-gui PTHREAD_LIB = -lpthread ! RANLIB = ranlib ! STRIP = strip VERSION = 0.1 XPM_LIBS = -lXpm *************** *** 209,212 **** --- 194,198 ---- distclean-am: distclean-generic clean-am + -rm -f libtool distclean: distclean-am Index: Makefile.in =================================================================== RCS file: /cvsroot/gnupos/quick-gui/m4/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.in 13 Jan 2003 11:57:08 -0000 1.2 --- Makefile.in 14 Jan 2003 11:53:56 -0000 1.3 *************** *** 61,74 **** host_triplet = @host@ AMTAR = @AMTAR@ AWK = @AWK@ - BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ - CATOBJEXT = @CATOBJEXT@ CC = @CC@ - DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ EXEEXT = @EXEEXT@ - GENCAT = @GENCAT@ - GLIBC21 = @GLIBC21@ - GMSGFMT = @GMSGFMT@ GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@ GNOMEUI_LIBS = @GNOMEUI_LIBS@ --- 61,71 ---- host_triplet = @host@ AMTAR = @AMTAR@ + AS = @AS@ AWK = @AWK@ CC = @CC@ DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ + ECHO = @ECHO@ EXEEXT = @EXEEXT@ GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@ GNOMEUI_LIBS = @GNOMEUI_LIBS@ *************** *** 86,104 **** GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ - HAVE_LIB = @HAVE_LIB@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ! INSTOBJEXT = @INSTOBJEXT@ ! INTLBISON = @INTLBISON@ ! INTLLIBS = @INTLLIBS@ ! INTLOBJS = @INTLOBJS@ ! INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LIB = @LIB@ ! LIBICONV = @LIBICONV@ ! LIBINTL = @LIBINTL@ ! LTLIB = @LTLIB@ ! LTLIBICONV = @LTLIBICONV@ ! LTLIBINTL = @LTLIBINTL@ MAKEINFO = @MAKEINFO@ ! MKINSTALLDIRS = @MKINSTALLDIRS@ OBJEXT = @OBJEXT@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ --- 83,91 ---- GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ! LIBTOOL = @LIBTOOL@ ! LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ ! OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ *************** *** 107,115 **** ORBIT_LIBS = @ORBIT_LIBS@ PACKAGE = @PACKAGE@ - POSUB = @POSUB@ PTHREAD_LIB = @PTHREAD_LIB@ RANLIB = @RANLIB@ ! USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ ! USE_NLS = @USE_NLS@ VERSION = @VERSION@ XPM_LIBS = @XPM_LIBS@ --- 94,100 ---- ORBIT_LIBS = @ORBIT_LIBS@ PACKAGE = @PACKAGE@ PTHREAD_LIB = @PTHREAD_LIB@ RANLIB = @RANLIB@ ! STRIP = @STRIP@ VERSION = @VERSION@ XPM_LIBS = @XPM_LIBS@ *************** *** 209,212 **** --- 194,198 ---- distclean-am: distclean-generic clean-am + -rm -f libtool distclean: distclean-am |