|
From: <cog...@us...> - 2003-11-23 22:56:32
|
Update of /cvsroot/morphix/gpppoe-conf/src
In directory sc8-pr-cvs1:/tmp/cvs-serv13891/src
Modified Files:
Makefile Makefile.in callbacks.c
Log Message:
Changed function for reading and testing account files (in speedtouch section).
Index: Makefile
===================================================================
RCS file: /cvsroot/morphix/gpppoe-conf/src/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile 22 Sep 2003 22:35:22 -0000 1.2
--- Makefile 23 Nov 2003 22:56:28 -0000 1.3
***************
*** 1,5 ****
! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
--- 1,7 ----
! # Makefile.in generated by automake 1.7.9 from Makefile.am.
! # src/Makefile. Generated from Makefile.in by configure.
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
! # Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
***************
*** 12,55 ****
- SHELL = /bin/sh
srcdir = .
top_srcdir = ..
! prefix = /usr/local
! exec_prefix = ${prefix}
!
! bindir = ${exec_prefix}/bin
! sbindir = ${exec_prefix}/sbin
! libexecdir = ${exec_prefix}/libexec
! datadir = ${prefix}/share
! sysconfdir = ${prefix}/etc
! sharedstatedir = ${prefix}/com
! localstatedir = ${prefix}/var
! libdir = ${exec_prefix}/lib
! infodir = ${prefix}/info
! mandir = ${prefix}/man
! includedir = ${prefix}/include
! oldincludedir = /usr/include
!
! DESTDIR =
!
! pkgdatadir = $(datadir)/gpppoe-account
! pkglibdir = $(libdir)/gpppoe-account
! pkgincludedir = $(includedir)/gpppoe-account
!
top_builddir = ..
! ACLOCAL = aclocal-1.4
! AUTOCONF = autoconf
! AUTOMAKE = automake-1.4
! AUTOHEADER = autoheader
!
INSTALL = /usr/bin/install -c
! INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
! INSTALL_DATA = ${INSTALL} -m 644
! INSTALL_SCRIPT = ${INSTALL}
! transform = s,x,x,
!
NORMAL_INSTALL = :
PRE_INSTALL = :
--- 14,33 ----
srcdir = .
top_srcdir = ..
! pkgdatadir = $(datadir)/gpppoe-conf
! pkglibdir = $(libdir)/gpppoe-conf
! pkgincludedir = $(includedir)/gpppoe-conf
top_builddir = ..
! am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = /usr/bin/install -c
! install_sh_DATA = $(install_sh) -c -m 644
! install_sh_PROGRAM = $(install_sh) -c
! install_sh_SCRIPT = $(install_sh) -c
! INSTALL_HEADER = $(INSTALL_DATA)
! transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
***************
*** 58,81 ****
PRE_UNINSTALL = :
POST_UNINSTALL = :
! host_alias =
! host_triplet = @host@
CATALOGS =
CATOBJEXT = .gmo
CC = gcc
DATADIRNAME = share
GETTEXT_PACKAGE = pppoe-account
GMOFILES =
GMSGFMT = /usr/bin/msgfmt
! HAVE_LIB = @HAVE_LIB@
INSTOBJEXT = .mo
INTLLIBS =
! LIB = @LIB@
! LTLIB = @LTLIB@
MAINT =
! MAKEINFO = makeinfo
MKINSTALLDIRS = ./mkinstalldirs
! PACKAGE = gpppoe-account
PACKAGE_CFLAGS = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/X11R6/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
PACKAGE_LIBS = -Wl,--export-dynamic -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0
PKG_CONFIG = /usr/bin/pkg-config
POFILES =
--- 36,92 ----
PRE_UNINSTALL = :
POST_UNINSTALL = :
! ACLOCAL = ${SHELL} /home/tiago/workspace/gpppoe-conf/missing --run aclocal-1.7
! AMDEP_FALSE = #
! AMDEP_TRUE =
! AMTAR = ${SHELL} /home/tiago/workspace/gpppoe-conf/missing --run tar
! AUTOCONF = ${SHELL} /home/tiago/workspace/gpppoe-conf/missing --run autoconf
! AUTOHEADER = ${SHELL} /home/tiago/workspace/gpppoe-conf/missing --run autoheader
! AUTOMAKE = ${SHELL} /home/tiago/workspace/gpppoe-conf/missing --run automake-1.7
! AWK = mawk
CATALOGS =
CATOBJEXT = .gmo
CC = gcc
+ CCDEPMODE = depmode=gcc3
+ CFLAGS = -g -O2
+ CPP = gcc -E
+ CPPFLAGS =
+ CYGPATH_W = echo
DATADIRNAME = share
+ DEFS = -DHAVE_CONFIG_H
+ DEPDIR = .deps
+ ECHO_C =
+ ECHO_N = -n
+ ECHO_T =
+ EGREP = grep -E
+ EXEEXT =
GETTEXT_PACKAGE = pppoe-account
GMOFILES =
GMSGFMT = /usr/bin/msgfmt
! INSTALL_DATA = ${INSTALL} -m 644
! INSTALL_PROGRAM = ${INSTALL}
! INSTALL_SCRIPT = ${INSTALL}
! INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
INSTOBJEXT = .mo
INTLLIBS =
! LDFLAGS =
! LIBOBJS =
! LIBS =
! LTLIBOBJS =
MAINT =
! MAINTAINER_MODE_FALSE = #
! MAINTAINER_MODE_TRUE =
! MAKEINFO = ${SHELL} /home/tiago/workspace/gpppoe-conf/missing --run makeinfo
MKINSTALLDIRS = ./mkinstalldirs
! MSGFMT = /usr/bin/msgfmt
! OBJEXT = o
! PACKAGE = gpppoe-conf
! PACKAGE_BUGREPORT =
PACKAGE_CFLAGS = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/X11R6/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
PACKAGE_LIBS = -Wl,--export-dynamic -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0
+ PACKAGE_NAME =
+ PACKAGE_STRING =
+ PACKAGE_TARNAME =
+ PACKAGE_VERSION =
+ PATH_SEPARATOR = :
PKG_CONFIG = /usr/bin/pkg-config
POFILES =
***************
*** 83,155 ****
PO_IN_DATADIR_FALSE =
PO_IN_DATADIR_TRUE =
USE_NLS = yes
! VERSION = 0.2
! INCLUDES = -DPACKAGE_DATA_DIR=\""$(datadir)"\" -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/X11R6/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
! bin_PROGRAMS = gpppoe-account
! gpppoe_account_SOURCES = main.c support.c support.h interface.c interface.h callbacks.c callbacks.h config-writer.c config-writer.h
! gpppoe_account_LDADD = -Wl,--export-dynamic -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 $(INTLLIBS)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
! CONFIG_HEADER = ../config.h
! CONFIG_CLEAN_FILES =
! PROGRAMS = $(bin_PROGRAMS)
! DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I..
! CPPFLAGS =
! LDFLAGS =
! LIBS =
! gpppoe_account_OBJECTS = main.o support.o interface.o callbacks.o \
! config-writer.o
! gpppoe_account_DEPENDENCIES =
! gpppoe_account_LDFLAGS =
! CFLAGS = -g -O2
! COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
! LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
! DIST_COMMON = Makefile.am Makefile.in
!
!
! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
! TAR = tar
! GZIP_ENV = --best
! DEP_FILES = .deps/callbacks.P .deps/config-writer.P .deps/interface.P \
! .deps/main.P .deps/support.P
! SOURCES = $(gpppoe_account_SOURCES)
! OBJECTS = $(gpppoe_account_OBJECTS)
- all: all-redirect
.SUFFIXES:
! .SUFFIXES: .S .c .o .s
! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
! cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile
!
! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
! cd $(top_builddir) \
! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
!
!
! mostlyclean-binPROGRAMS:
!
! clean-binPROGRAMS:
! -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
!
! distclean-binPROGRAMS:
!
! maintainer-clean-binPROGRAMS:
!
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
! if test -f $$p; then \
! echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
! $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
else :; fi; \
done
--- 94,196 ----
PO_IN_DATADIR_FALSE =
PO_IN_DATADIR_TRUE =
+ SET_MAKE =
+ SHELL = /bin/sh
+ STRIP =
USE_NLS = yes
! VERSION = 0.2.1
! XGETTEXT = /usr/bin/xgettext
! ac_ct_CC = gcc
! ac_ct_STRIP =
! am__fastdepCC_FALSE = #
! am__fastdepCC_TRUE =
! am__include = include
! am__leading_dot = .
! am__quote =
! bindir = ${exec_prefix}/bin
! build_alias =
! datadir = ${prefix}/share
! exec_prefix = ${prefix}
! host_alias =
! includedir = ${prefix}/include
! infodir = ${prefix}/info
! install_sh = /home/tiago/workspace/gpppoe-conf/install-sh
! libdir = ${exec_prefix}/lib
! libexecdir = ${exec_prefix}/libexec
! localstatedir = ${prefix}/var
! mandir = ${prefix}/man
! oldincludedir = /usr/include
! prefix = /usr/local
! program_transform_name = s,x,x,
! sbindir = ${exec_prefix}/sbin
! sharedstatedir = ${prefix}/com
! sysconfdir = ${prefix}/etc
! target_alias =
! INCLUDES = \
! -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
! -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
! -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/X11R6/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
! bin_PROGRAMS = gpppoe-conf
! gpppoe_conf_SOURCES = \
! main.c \
! support.c support.h \
! interface.c interface.h \
! callbacks.c callbacks.h \
! config-writer.c config-writer.h
! gpppoe_conf_LDADD = -Wl,--export-dynamic -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 $(INTLLIBS)
! subdir = src
! ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
! CONFIG_HEADER = $(top_builddir)/config.h
! CONFIG_CLEAN_FILES =
! bin_PROGRAMS = gpppoe-conf$(EXEEXT)
! PROGRAMS = $(bin_PROGRAMS)
+ am_gpppoe_conf_OBJECTS = main.$(OBJEXT) support.$(OBJEXT) \
+ interface.$(OBJEXT) callbacks.$(OBJEXT) config-writer.$(OBJEXT)
+ gpppoe_conf_OBJECTS = $(am_gpppoe_conf_OBJECTS)
+ gpppoe_conf_DEPENDENCIES =
+ gpppoe_conf_LDFLAGS =
! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
! depcomp = $(SHELL) $(top_srcdir)/depcomp
! am__depfiles_maybe = depfiles
! DEP_FILES = ./$(DEPDIR)/callbacks.Po \
! ./$(DEPDIR)/config-writer.Po \
! ./$(DEPDIR)/interface.Po ./$(DEPDIR)/main.Po \
! ./$(DEPDIR)/support.Po
! COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
! $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
! LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
! DIST_SOURCES = $(gpppoe_conf_SOURCES)
! DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
! SOURCES = $(gpppoe_conf_SOURCES)
! all: all-am
.SUFFIXES:
! .SUFFIXES: .c .o .obj
! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
! cd $(top_srcdir) && \
! $(AUTOMAKE) --gnu src/Makefile
! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
! binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
! p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
! if test -f $$p \
! ; then \
! f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
! echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
! $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
else :; fi; \
done
***************
*** 157,292 ****
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
! list='$(bin_PROGRAMS)'; for p in $$list; do \
! rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
done
! .s.o:
! $(COMPILE) -c $<
!
! .S.o:
! $(COMPILE) -c $<
mostlyclean-compile:
! -rm -f *.o core *.core
!
! clean-compile:
distclean-compile:
-rm -f *.tab.c
! maintainer-clean-compile:
! gpppoe-account: $(gpppoe_account_OBJECTS) $(gpppoe_account_DEPENDENCIES)
! @rm -f gpppoe-account
! $(LINK) $(gpppoe_account_LDFLAGS) $(gpppoe_account_OBJECTS) $(gpppoe_account_LDADD) $(LIBS)
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP)
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! here=`pwd` && cd $(srcdir) \
! && mkid -f$$here/ID $$unique $(LISP)
! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
tags=; \
here=`pwd`; \
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
! || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
! mostlyclean-tags:
! clean-tags:
distclean-tags:
! -rm -f TAGS ID
!
! maintainer-clean-tags:
!
! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
! subdir = src
distdir: $(DISTFILES)
! here=`cd $(top_builddir) && pwd`; \
! top_distdir=`cd $(top_distdir) && pwd`; \
! distdir=`cd $(distdir) && pwd`; \
! cd $(top_srcdir) \
! && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile
! @for file in $(DISTFILES); do \
! d=$(srcdir); \
if test -d $$d/$$file; then \
! cp -pr $$d/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
! || cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
-
- DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-
- -include $(DEP_FILES)
-
- mostlyclean-depend:
-
- clean-depend:
-
- distclean-depend:
- -rm -rf .deps
-
- maintainer-clean-depend:
-
- %.o: %.c
- @echo '$(COMPILE) -c $<'; \
- $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
- @-cp .deps/$(*F).pp .deps/$(*F).P; \
- tr ' ' '\012' < .deps/$(*F).pp \
- | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
- >> .deps/$(*F).P; \
- rm .deps/$(*F).pp
-
- %.lo: %.c
- @echo '$(LTCOMPILE) -c $<'; \
- $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
- @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
- < .deps/$(*F).pp > .deps/$(*F).P; \
- tr ' ' '\012' < .deps/$(*F).pp \
- | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
- >> .deps/$(*F).P; \
- rm -f .deps/$(*F).pp
- info-am:
- info: info-am
- dvi-am:
- dvi: dvi-am
check-am: all-am
check: check-am
! installcheck-am:
! installcheck: installcheck-am
! install-exec-am: install-binPROGRAMS
! install-exec: install-exec-am
! install-data-am:
install-data: install-data-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
- install: install-am
- uninstall-am: uninstall-binPROGRAMS
- uninstall: uninstall-am
- all-am: Makefile $(PROGRAMS)
- all-redirect: all-am
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
- installdirs:
- $(mkinstalldirs) $(DESTDIR)$(bindir)
-
mostlyclean-generic:
--- 198,353 ----
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
! @list='$(bin_PROGRAMS)'; for p in $$list; do \
! f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
! echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
! rm -f $(DESTDIR)$(bindir)/$$f; \
done
! clean-binPROGRAMS:
! -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
! gpppoe-conf$(EXEEXT): $(gpppoe_conf_OBJECTS) $(gpppoe_conf_DEPENDENCIES)
! @rm -f gpppoe-conf$(EXEEXT)
! $(LINK) $(gpppoe_conf_LDFLAGS) $(gpppoe_conf_OBJECTS) $(gpppoe_conf_LDADD) $(LIBS)
mostlyclean-compile:
! -rm -f *.$(OBJEXT) core *.core
distclean-compile:
-rm -f *.tab.c
! include ./$(DEPDIR)/callbacks.Po
! include ./$(DEPDIR)/config-writer.Po
! include ./$(DEPDIR)/interface.Po
! include ./$(DEPDIR)/main.Po
! include ./$(DEPDIR)/support.Po
! .c.o:
! if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
! -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
! then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
! else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
! fi
! # source='$<' object='$@' libtool=no \
! # depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
! # $(CCDEPMODE) $(depcomp) \
! # $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
!
! .c.obj:
! if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
! -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
! then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
! else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
! fi
! # source='$<' object='$@' libtool=no \
! # depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
! # $(CCDEPMODE) $(depcomp) \
! # $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
! uninstall-info-am:
!
! ETAGS = etags
! ETAGSFLAGS =
!
! CTAGS = ctags
! CTAGSFLAGS =
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! mkid -fID $$unique
! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
! $(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! test -z "$(ETAGS_ARGS)$$tags$$unique" \
! || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
! $$tags $$unique
! ctags: CTAGS
! CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
! $(TAGS_FILES) $(LISP)
! tags=; \
! here=`pwd`; \
! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
! END { for (i in files) print i; }'`; \
! test -z "$(CTAGS_ARGS)$$tags$$unique" \
! || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
! $$tags $$unique
! GTAGS:
! here=`$(am__cd) $(top_builddir) && pwd` \
! && cd $(top_srcdir) \
! && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
! top_distdir = ..
! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
! list='$(DISTFILES)'; for file in $$list; do \
! case $$file in \
! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
! esac; \
! if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
! if test "$$dir" != "$$file" && test "$$dir" != "."; then \
! dir="/$$dir"; \
! $(mkinstalldirs) "$(distdir)$$dir"; \
! else \
! dir=''; \
! fi; \
if test -d $$d/$$file; then \
! if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
! cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
! fi; \
! cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
test -f $(distdir)/$$file \
! || cp -p $$d/$$file $(distdir)/$$file \
! || exit 1; \
fi; \
done
check-am: all-am
check: check-am
! all-am: Makefile $(PROGRAMS)
! installdirs:
! $(mkinstalldirs) $(DESTDIR)$(bindir)
! install: install-am
! install-exec: install-exec-am
install-data: install-data-am
+ uninstall: uninstall-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
***************
*** 294,337 ****
distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES)
! -rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
! mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \
! mostlyclean-tags mostlyclean-depend mostlyclean-generic
! mostlyclean: mostlyclean-am
! clean-am: clean-binPROGRAMS clean-compile clean-tags clean-depend \
! clean-generic mostlyclean-am
! clean: clean-am
! distclean-am: distclean-binPROGRAMS distclean-compile distclean-tags \
! distclean-depend distclean-generic clean-am
! distclean: distclean-am
! maintainer-clean-am: maintainer-clean-binPROGRAMS \
! maintainer-clean-compile maintainer-clean-tags \
! maintainer-clean-depend maintainer-clean-generic \
! distclean-am
! @echo "This command is intended for maintainers to use;"
! @echo "it deletes files that may require special tools to rebuild."
maintainer-clean: maintainer-clean-am
! .PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
! maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
! mostlyclean-compile distclean-compile clean-compile \
! maintainer-clean-compile tags mostlyclean-tags distclean-tags \
! clean-tags maintainer-clean-tags distdir mostlyclean-depend \
! distclean-depend clean-depend maintainer-clean-depend info-am info \
! dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
! install-exec install-data-am install-data install-am install \
! uninstall-am uninstall all-redirect all-am all installdirs \
! mostlyclean-generic distclean-generic clean-generic \
! maintainer-clean-generic clean mostlyclean distclean maintainer-clean
# Tell versions [3.59,3.63) of GNU make to not export all variables.
--- 355,420 ----
distclean-generic:
! -rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
! @echo "This command is intended for maintainers to use"
! @echo "it deletes files that may require special tools to rebuild."
! clean: clean-am
! clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
! distclean: distclean-am
! -rm -rf ./$(DEPDIR)
! -rm -f Makefile
! distclean-am: clean-am distclean-compile distclean-generic \
! distclean-tags
! dvi: dvi-am
! dvi-am:
! info: info-am
! info-am:
!
! install-data-am:
!
! install-exec-am: install-binPROGRAMS
!
! install-info: install-info-am
!
! install-man:
!
! installcheck-am:
maintainer-clean: maintainer-clean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ maintainer-clean-am: distclean-am maintainer-clean-generic
! mostlyclean: mostlyclean-am
!
! mostlyclean-am: mostlyclean-compile mostlyclean-generic
!
! pdf: pdf-am
!
! pdf-am:
+ ps: ps-am
+
+ ps-am:
+
+ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ clean-generic ctags distclean distclean-compile \
+ distclean-generic distclean-tags distdir dvi dvi-am info \
+ info-am install install-am install-binPROGRAMS install-data \
+ install-data-am install-exec install-exec-am install-info \
+ install-info-am install-man install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am uninstall-binPROGRAMS uninstall-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: Makefile.in
===================================================================
RCS file: /cvsroot/morphix/gpppoe-conf/src/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.in 22 Sep 2003 22:35:22 -0000 1.2
--- Makefile.in 23 Nov 2003 22:56:28 -0000 1.3
***************
*** 1,5 ****
! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
--- 1,7 ----
! # Makefile.in generated by automake 1.7.9 from Makefile.am.
! # @configure_input@
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
! # Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
***************
*** 11,55 ****
# PARTICULAR PURPOSE.
!
! SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
-
- bindir = @bindir@
- sbindir = @sbindir@
- libexecdir = @libexecdir@
- datadir = @datadir@
- sysconfdir = @sysconfdir@
- sharedstatedir = @sharedstatedir@
- localstatedir = @localstatedir@
- libdir = @libdir@
- infodir = @infodir@
- mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
-
- DESTDIR =
-
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-
top_builddir = ..
! ACLOCAL = @ACLOCAL@
! AUTOCONF = @AUTOCONF@
! AUTOMAKE = @AUTOMAKE@
! AUTOHEADER = @AUTOHEADER@
!
INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
! INSTALL_DATA = @INSTALL_DATA@
! INSTALL_SCRIPT = @INSTALL_SCRIPT@
! transform = @program_transform_name@
!
NORMAL_INSTALL = :
PRE_INSTALL = :
--- 13,33 ----
# PARTICULAR PURPOSE.
! @SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
! am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
! install_sh_DATA = $(install_sh) -c -m 644
! install_sh_PROGRAM = $(install_sh) -c
! install_sh_SCRIPT = $(install_sh) -c
! INSTALL_HEADER = $(INSTALL_DATA)
! transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
***************
*** 58,81 ****
PRE_UNINSTALL = :
POST_UNINSTALL = :
! host_alias = @host_alias@
! host_triplet = @host@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
DATADIRNAME = @DATADIRNAME@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
! HAVE_LIB = @HAVE_LIB@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
! LIB = @LIB@
! LTLIB = @LTLIB@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKINSTALLDIRS = @MKINSTALLDIRS@
PACKAGE = @PACKAGE@
PACKAGE_CFLAGS = @PACKAGE_CFLAGS@
PACKAGE_LIBS = @PACKAGE_LIBS@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
--- 36,92 ----
PRE_UNINSTALL = :
POST_UNINSTALL = :
! ACLOCAL = @ACLOCAL@
! AMDEP_FALSE = @AMDEP_FALSE@
! AMDEP_TRUE = @AMDEP_TRUE@
! AMTAR = @AMTAR@
! AUTOCONF = @AUTOCONF@
! AUTOHEADER = @AUTOHEADER@
! AUTOMAKE = @AUTOMAKE@
! AWK = @AWK@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
! INSTALL_DATA = @INSTALL_DATA@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@
! INSTALL_SCRIPT = @INSTALL_SCRIPT@
! INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
! LDFLAGS = @LDFLAGS@
! LIBOBJS = @LIBOBJS@
! LIBS = @LIBS@
! LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_CFLAGS = @PACKAGE_CFLAGS@
PACKAGE_LIBS = @PACKAGE_LIBS@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
***************
*** 83,155 ****
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
! INCLUDES = -DPACKAGE_DATA_DIR=\""$(datadir)"\" -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" @PACKAGE_CFLAGS@
! bin_PROGRAMS = gpppoe-account
! gpppoe_account_SOURCES = main.c support.c support.h interface.c interface.h callbacks.c callbacks.h config-writer.c config-writer.h
! gpppoe_account_LDADD = @PACKAGE_LIBS@ $(INTLLIBS)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
! CONFIG_HEADER = ../config.h
! CONFIG_CLEAN_FILES =
! PROGRAMS = $(bin_PROGRAMS)
! DEFS = @DEFS@ -I. -I$(srcdir) -I..
! CPPFLAGS = @CPPFLAGS@
! LDFLAGS = @LDFLAGS@
! LIBS = @LIBS@
! gpppoe_account_OBJECTS = main.o support.o interface.o callbacks.o \
! config-writer.o
! gpppoe_account_DEPENDENCIES =
! gpppoe_account_LDFLAGS =
! CFLAGS = @CFLAGS@
! COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
! LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
! DIST_COMMON = Makefile.am Makefile.in
!
!
! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
! TAR = tar
! GZIP_ENV = --best
! DEP_FILES = .deps/callbacks.P .deps/config-writer.P .deps/interface.P \
! .deps/main.P .deps/support.P
! SOURCES = $(gpppoe_account_SOURCES)
! OBJECTS = $(gpppoe_account_OBJECTS)
- all: all-redirect
.SUFFIXES:
! .SUFFIXES: .S .c .o .s
! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
! cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile
!
! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
! cd $(top_builddir) \
! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
!
!
! mostlyclean-binPROGRAMS:
!
! clean-binPROGRAMS:
! -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
!
! distclean-binPROGRAMS:
!
! maintainer-clean-binPROGRAMS:
!
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
! if test -f $$p; then \
! echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
! $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
else :; fi; \
done
--- 94,196 ----
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ XGETTEXT = @XGETTEXT@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_STRIP = @ac_ct_STRIP@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ bindir = @bindir@
+ build_alias = @build_alias@
+ datadir = @datadir@
+ exec_prefix = @exec_prefix@
+ host_alias = @host_alias@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
! INCLUDES = \
! -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
! -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
! @PACKAGE_CFLAGS@
! bin_PROGRAMS = gpppoe-conf
! gpppoe_conf_SOURCES = \
! main.c \
! support.c support.h \
! interface.c interface.h \
! callbacks.c callbacks.h \
! config-writer.c config-writer.h
! gpppoe_conf_LDADD = @PACKAGE_LIBS@ $(INTLLIBS)
! subdir = src
! ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
! CONFIG_HEADER = $(top_builddir)/config.h
! CONFIG_CLEAN_FILES =
! bin_PROGRAMS = gpppoe-conf$(EXEEXT)
! PROGRAMS = $(bin_PROGRAMS)
+ am_gpppoe_conf_OBJECTS = main.$(OBJEXT) support.$(OBJEXT) \
+ interface.$(OBJEXT) callbacks.$(OBJEXT) config-writer.$(OBJEXT)
+ gpppoe_conf_OBJECTS = $(am_gpppoe_conf_OBJECTS)
+ gpppoe_conf_DEPENDENCIES =
+ gpppoe_conf_LDFLAGS =
! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
! depcomp = $(SHELL) $(top_srcdir)/depcomp
! am__depfiles_maybe = depfiles
! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/callbacks.Po \
! @AMDEP_TRUE@ ./$(DEPDIR)/config-writer.Po \
! @AMDEP_TRUE@ ./$(DEPDIR)/interface.Po ./$(DEPDIR)/main.Po \
! @AMDEP_TRUE@ ./$(DEPDIR)/support.Po
! COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
! $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
! LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
! DIST_SOURCES = $(gpppoe_conf_SOURCES)
! DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
! SOURCES = $(gpppoe_conf_SOURCES)
! all: all-am
.SUFFIXES:
! .SUFFIXES: .c .o .obj
! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
! cd $(top_srcdir) && \
! $(AUTOMAKE) --gnu src/Makefile
! Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
! binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
! p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
! if test -f $$p \
! ; then \
! f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
! echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
! $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
else :; fi; \
done
***************
*** 157,292 ****
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
! list='$(bin_PROGRAMS)'; for p in $$list; do \
! rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
done
! .s.o:
! $(COMPILE) -c $<
!
! .S.o:
! $(COMPILE) -c $<
mostlyclean-compile:
! -rm -f *.o core *.core
!
! clean-compile:
distclean-compile:
-rm -f *.tab.c
! maintainer-clean-compile:
! gpppoe-account: $(gpppoe_account_OBJECTS) $(gpppoe_account_DEPENDENCIES)
! @rm -f gpppoe-account
! $(LINK) $(gpppoe_account_LDFLAGS) $(gpppoe_account_OBJECTS) $(gpppoe_account_LDADD) $(LIBS)
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP)
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! here=`pwd` && cd $(srcdir) \
! && mkid -f$$here/ID $$unique $(LISP)
! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
tags=; \
here=`pwd`; \
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
! || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
! mostlyclean-tags:
! clean-tags:
distclean-tags:
! -rm -f TAGS ID
!
! maintainer-clean-tags:
!
! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
! subdir = src
distdir: $(DISTFILES)
! here=`cd $(top_builddir) && pwd`; \
! top_distdir=`cd $(top_distdir) && pwd`; \
! distdir=`cd $(distdir) && pwd`; \
! cd $(top_srcdir) \
! && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile
! @for file in $(DISTFILES); do \
! d=$(srcdir); \
if test -d $$d/$$file; then \
! cp -pr $$d/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
! || cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
-
- DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-
- -include $(DEP_FILES)
-
- mostlyclean-depend:
-
- clean-depend:
-
- distclean-depend:
- -rm -rf .deps
-
- maintainer-clean-depend:
-
- %.o: %.c
- @echo '$(COMPILE) -c $<'; \
- $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
- @-cp .deps/$(*F).pp .deps/$(*F).P; \
- tr ' ' '\012' < .deps/$(*F).pp \
- | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
- >> .deps/$(*F).P; \
- rm .deps/$(*F).pp
-
- %.lo: %.c
- @echo '$(LTCOMPILE) -c $<'; \
- $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
- @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
- < .deps/$(*F).pp > .deps/$(*F).P; \
- tr ' ' '\012' < .deps/$(*F).pp \
- | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
- >> .deps/$(*F).P; \
- rm -f .deps/$(*F).pp
- info-am:
- info: info-am
- dvi-am:
- dvi: dvi-am
check-am: all-am
check: check-am
! installcheck-am:
! installcheck: installcheck-am
! install-exec-am: install-binPROGRAMS
! install-exec: install-exec-am
! install-data-am:
install-data: install-data-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
- install: install-am
- uninstall-am: uninstall-binPROGRAMS
- uninstall: uninstall-am
- all-am: Makefile $(PROGRAMS)
- all-redirect: all-am
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
- installdirs:
- $(mkinstalldirs) $(DESTDIR)$(bindir)
-
mostlyclean-generic:
--- 198,353 ----
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
! @list='$(bin_PROGRAMS)'; for p in $$list; do \
! f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
! echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
! rm -f $(DESTDIR)$(bindir)/$$f; \
done
! clean-binPROGRAMS:
! -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
! gpppoe-conf$(EXEEXT): $(gpppoe_conf_OBJECTS) $(gpppoe_conf_DEPENDENCIES)
! @rm -f gpppoe-conf$(EXEEXT)
! $(LINK) $(gpppoe_conf_LDFLAGS) $(gpppoe_conf_OBJECTS) $(gpppoe_conf_LDADD) $(LIBS)
mostlyclean-compile:
! -rm -f *.$(OBJEXT) core *.core
distclean-compile:
-rm -f *.tab.c
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/callbacks.Po@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/config-writer.Po@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interface.Po@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/support.Po@am__quote@
! .c.o:
! @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
! @am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
! @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
! @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
! @am__fastdepCC_TRUE@ fi
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! @am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
!
! .c.obj:
! @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
! @am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
! @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
! @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
! @am__fastdepCC_TRUE@ fi
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! @am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
! uninstall-info-am:
!
! ETAGS = etags
! ETAGSFLAGS =
!
! CTAGS = ctags
! CTAGSFLAGS =
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! mkid -fID $$unique
! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
! $(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! test -z "$(ETAGS_ARGS)$$tags$$unique" \
! || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
! $$tags $$unique
! ctags: CTAGS
! CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
! $(TAGS_FILES) $(LISP)
! tags=; \
! here=`pwd`; \
! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
! END { for (i in files) print i; }'`; \
! test -z "$(CTAGS_ARGS)$$tags$$unique" \
! || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
! $$tags $$unique
! GTAGS:
! here=`$(am__cd) $(top_builddir) && pwd` \
! && cd $(top_srcdir) \
! && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
! top_distdir = ..
! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
! list='$(DISTFILES)'; for file in $$list; do \
! case $$file in \
! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
! esac; \
! if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
! if test "$$dir" != "$$file" && test "$$dir" != "."; then \
! dir="/$$dir"; \
! $(mkinstalldirs) "$(distdir)$$dir"; \
! else \
! dir=''; \
! fi; \
if test -d $$d/$$file; then \
! if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
! cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
! fi; \
! cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
test -f $(distdir)/$$file \
! || cp -p $$d/$$file $(distdir)/$$file \
! || exit 1; \
fi; \
done
check-am: all-am
check: check-am
! all-am: Makefile $(PROGRAMS)
! installdirs:
! $(mkinstalldirs) $(DESTDIR)$(bindir)
! install: install-am
! install-exec: install-exec-am
install-data: install-data-am
+ uninstall: uninstall-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
***************
*** 294,337 ****
distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES)
! -rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
! mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \
! mostlyclean-tags mostlyclean-depend mostlyclean-generic
! mostlyclean: mostlyclean-am
! clean-am: clean-binPROGRAMS clean-compile clean-tags clean-depend \
! clean-generic mostlyclean-am
! clean: clean-am
! distclean-am: distclean-binPROGRAMS distclean-compile distclean-tags \
! distclean-depend distclean-generic clean-am
! distclean: distclean-am
! maintainer-clean-am: maintainer-clean-binPROGRAMS \
! maintainer-clean-compile maintainer-clean-tags \
! maintainer-clean-depend maintainer-clean-generic \
! distclean-am
! @echo "This command is intended for maintainers to use;"
! @echo "it deletes files that may require special tools to rebuild."
maintainer-clean: maintainer-clean-am
! .PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
! maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
! mostlyclean-compile distclean-compile clean-compile \
! maintainer-clean-compile tags mostlyclean-tags distclean-tags \
! clean-tags maintainer-clean-tags distdir mostlyclean-depend \
! distclean-depend clean-depend maintainer-clean-depend info-am info \
! dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
! install-exec install-data-am install-data install-am install \
! uninstall-am uninstall all-redirect all-am all installdirs \
! mostlyclean-generic distclean-generic clean-generic \
! maintainer-clean-generic clean mostlyclean distclean maintainer-clean
# Tell versions [3.59,3.63) of GNU make to not export all variables.
--- 355,420 ----
distclean-generic:
! -rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
! @echo "This command is intended for maintainers to use"
! @echo "it deletes files that may require special tools to rebuild."
! clean: clean-am
! clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
! distclean: distclean-am
! -rm -rf ./$(DEPDIR)
! -rm -f Makefile
! distclean-am: clean-am distclean-compile distclean-generic \
! distclean-tags
! dvi: dvi-am
! dvi-am:
! info: info-am
! info-am:
!
! install-data-am:
!
! install-exec-am: install-binPROGRAMS
!
! install-info: install-info-am
!
! install-man:
!
! installcheck-am:
maintainer-clean: maintainer-clean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ maintainer-clean-am: distclean-am maintainer-clean-generic
! mostlyclean: mostlyclean-am
!
! mostlyclean-am: mostlyclean-compile mostlyclean-generic
!
! pdf: pdf-am
!
! pdf-am:
+ ps: ps-am
+
+ ps-am:
+
+ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ clean-generic ctags distclean distclean-compile \
+ distclean-generic distclean-tags distdir dvi dvi-am info \
+ info-am install install-am install-binPROGRAMS install-data \
+ install-data-am install-exec install-exec-am install-info \
+ install-info-am install-man install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am uninstall-binPROGRAMS uninstall-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: callbacks.c
===================================================================
RCS file: /cvsroot/morphix/gpppoe-conf/src/callbacks.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** callbacks.c 22 Sep 2003 22:35:22 -0000 1.2
--- callbacks.c 23 Nov 2003 22:56:28 -0000 1.3
***************
*** 35,39 ****
speedtouch.account = "pppoe_account";
! speedtouch.firmware = "/usr/share/mgmt.o";
speedtouch.vpi = 0;
speedtouch.vci = 35;
--- 35,39 ----
speedtouch.account = "pppoe_account";
! speedtouch.firmware = "/usr/share/speedtouch/mgmt.o";
speedtouch.vpi = 0;
speedtouch.vci = 35;
***************
*** 74,89 ****
// Combo box is created:
GtkWidget *cmbAccounts = lookup_widget(GTK_WIDGET(wndSpeedtouch), "cmbAccounts");
! static DIR *accounts = NULL;
! struct dirent *entry;
GList *lst_accounts = NULL;
! if(accounts == NULL)
! accounts = opendir("/etc/ppp/peers");
! else
! rewinddir(accounts);
! while( (entry = readdir(accounts)) != NULL) {
! if(entry->d_type == DT_REG) {
! lst_accounts = g_list_append(lst_accounts, entry->d_name);
! }
}
gtk_combo_set_popdown_strings (GTK_COMBO (cmbAccounts), lst_accounts);
}
--- 74,90 ----
// Combo box is created:
GtkWidget *cmbAccounts = lookup_widget(GTK_WIDGET(wndSpeedtouch), "cmbAccounts");
! GDir *accounts = NULL;
GList *lst_accounts = NULL;
! accounts = g_dir_open("/etc/ppp/peers", 0, NULL);
! gchar *abs_file = NULL, *name = NULL;
!
! while( (name = (gchar *) g_dir_read_name(accounts)) != NULL) {
! abs_file = g_strconcat("/etc/ppp/peers/", name, NULL);
! if(g_file_test(abs_file, G_FILE_TEST_IS_REGULAR))
! lst_accounts = g_list_append(lst_accounts, g_strdup(name));
! g_free(abs_file);
}
+ g_dir_close(accounts);
+
gtk_combo_set_popdown_strings (GTK_COMBO (cmbAccounts), lst_accounts);
}
|