[Gnupos-cvs] quick-gui/macros Makefile,1.1.1.1,1.2

[<con...@us...>]

Update of /cvsroot/gnupos/quick-gui/macros
In directory sc8-pr-cvs1:/tmp/cvs-serv28443/macros

Modified Files:
	Makefile 
Log Message:


Now compiles and works. 0.5 here we come!



Index: Makefile
===================================================================
RCS file: /cvsroot/gnupos/quick-gui/macros/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:10 -0000	1.1.1.1
--- Makefile	14 Jan 2003 11:53:57 -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
***************
*** 263,266 ****
--- 248,252 ----
  
  distclean-am:  distclean-generic clean-am
+ 	-rm -f libtool
  
  distclean: distclean-am