From 9d8970e27a28970c5a5b10bed51110e3ca778a87 Mon Sep 17 00:00:00 2001 From: Doug Torrance Date: Tue, 19 May 2015 22:30:56 -0500 Subject: [PATCH] wmppp.app: Move source files to top directory. This way, users need only type "make" to build instead of needing to "cd wmppp" first. --- wmppp.app/INSTALL | 11 +++++------ wmppp.app/{wmppp => }/Makefile | 6 +++--- wmppp.app/{wmppp => }/example-scripts/chap-secrets | 0 wmppp.app/{wmppp => }/example-scripts/connect-errors | 0 wmppp.app/{wmppp => }/example-scripts/ip-down | 0 wmppp.app/{wmppp => }/example-scripts/ip-up | 0 wmppp.app/{wmppp => }/example-scripts/options | 0 wmppp.app/{wmppp => }/example-scripts/pap-secrets | 0 wmppp.app/{wmppp => }/example-scripts/wmppp-chat | 0 wmppp.app/{wmppp => }/example-scripts/wmppp-ifdown | 0 wmppp.app/{wmppp => }/example-scripts/wmppp-start | 0 wmppp.app/{wmppp => }/example-scripts/wmppp-stop | 0 wmppp.app/{wmppp => }/getmodemspeed.c | 0 wmppp.app/{wmppp => }/system.wmppprc | 0 wmppp.app/{wmppp => }/user.wmppprc | 0 wmppp.app/{wmppp => }/wmppp-master.xpm | 0 wmppp.app/{wmppp => }/wmppp.1 | 0 wmppp.app/{wmppp => }/wmppp.c | 4 ++-- 18 files changed, 10 insertions(+), 11 deletions(-) rename wmppp.app/{wmppp => }/Makefile (90%) rename wmppp.app/{wmppp => }/example-scripts/chap-secrets (100%) rename wmppp.app/{wmppp => }/example-scripts/connect-errors (100%) rename wmppp.app/{wmppp => }/example-scripts/ip-down (100%) rename wmppp.app/{wmppp => }/example-scripts/ip-up (100%) rename wmppp.app/{wmppp => }/example-scripts/options (100%) rename wmppp.app/{wmppp => }/example-scripts/pap-secrets (100%) rename wmppp.app/{wmppp => }/example-scripts/wmppp-chat (100%) rename wmppp.app/{wmppp => }/example-scripts/wmppp-ifdown (100%) rename wmppp.app/{wmppp => }/example-scripts/wmppp-start (100%) rename wmppp.app/{wmppp => }/example-scripts/wmppp-stop (100%) rename wmppp.app/{wmppp => }/getmodemspeed.c (100%) rename wmppp.app/{wmppp => }/system.wmppprc (100%) rename wmppp.app/{wmppp => }/user.wmppprc (100%) rename wmppp.app/{wmppp => }/wmppp-master.xpm (100%) rename wmppp.app/{wmppp => }/wmppp.1 (100%) rename wmppp.app/{wmppp => }/wmppp.c (99%) diff --git a/wmppp.app/INSTALL b/wmppp.app/INSTALL index 504660b..44be0c4 100644 --- a/wmppp.app/INSTALL +++ b/wmppp.app/INSTALL @@ -21,15 +21,14 @@ Requirements Installation -------------------------------------------------------------- 1) % tar -zxvf wmppp-1.x.x-tar.gz -2) % cd wmppp.app/ -3) % make all -4) % su root -5) # make install -6) # vi ~/.wmppprc +2) % make all +3) % su root +4) # make install +5) # vi ~/.wmppprc set up the paths to your ppp start, stop & restart scripts -7) % wmppp & (try 'wmppp -h &' for help) +6) % wmppp & (try 'wmppp -h &' for help) Extra Install Info For Site Administrators! diff --git a/wmppp.app/wmppp/Makefile b/wmppp.app/Makefile similarity index 90% rename from wmppp.app/wmppp/Makefile rename to wmppp.app/Makefile index bd64608..c1fcce4 100644 --- a/wmppp.app/wmppp/Makefile +++ b/wmppp.app/Makefile @@ -2,9 +2,9 @@ LIBDIR = -L/usr/X11R6/lib LIBS = -lXpm -lXext -lX11 CFLAGS += -O2 OBJS = wmppp.o \ - ../wmgeneral/wmgeneral.o \ - ../wmgeneral/misc.o \ - ../wmgeneral/list.o + wmgeneral/wmgeneral.o \ + wmgeneral/misc.o \ + wmgeneral/list.o .c.o: cc -g -c $(CPPFLAGS) $(CFLAGS) -Wall $< -o $*.o diff --git a/wmppp.app/wmppp/example-scripts/chap-secrets b/wmppp.app/example-scripts/chap-secrets similarity index 100% rename from wmppp.app/wmppp/example-scripts/chap-secrets rename to wmppp.app/example-scripts/chap-secrets diff --git a/wmppp.app/wmppp/example-scripts/connect-errors b/wmppp.app/example-scripts/connect-errors similarity index 100% rename from wmppp.app/wmppp/example-scripts/connect-errors rename to wmppp.app/example-scripts/connect-errors diff --git a/wmppp.app/wmppp/example-scripts/ip-down b/wmppp.app/example-scripts/ip-down similarity index 100% rename from wmppp.app/wmppp/example-scripts/ip-down rename to wmppp.app/example-scripts/ip-down diff --git a/wmppp.app/wmppp/example-scripts/ip-up b/wmppp.app/example-scripts/ip-up similarity index 100% rename from wmppp.app/wmppp/example-scripts/ip-up rename to wmppp.app/example-scripts/ip-up diff --git a/wmppp.app/wmppp/example-scripts/options b/wmppp.app/example-scripts/options similarity index 100% rename from wmppp.app/wmppp/example-scripts/options rename to wmppp.app/example-scripts/options diff --git a/wmppp.app/wmppp/example-scripts/pap-secrets b/wmppp.app/example-scripts/pap-secrets similarity index 100% rename from wmppp.app/wmppp/example-scripts/pap-secrets rename to wmppp.app/example-scripts/pap-secrets diff --git a/wmppp.app/wmppp/example-scripts/wmppp-chat b/wmppp.app/example-scripts/wmppp-chat similarity index 100% rename from wmppp.app/wmppp/example-scripts/wmppp-chat rename to wmppp.app/example-scripts/wmppp-chat diff --git a/wmppp.app/wmppp/example-scripts/wmppp-ifdown b/wmppp.app/example-scripts/wmppp-ifdown similarity index 100% rename from wmppp.app/wmppp/example-scripts/wmppp-ifdown rename to wmppp.app/example-scripts/wmppp-ifdown diff --git a/wmppp.app/wmppp/example-scripts/wmppp-start b/wmppp.app/example-scripts/wmppp-start similarity index 100% rename from wmppp.app/wmppp/example-scripts/wmppp-start rename to wmppp.app/example-scripts/wmppp-start diff --git a/wmppp.app/wmppp/example-scripts/wmppp-stop b/wmppp.app/example-scripts/wmppp-stop similarity index 100% rename from wmppp.app/wmppp/example-scripts/wmppp-stop rename to wmppp.app/example-scripts/wmppp-stop diff --git a/wmppp.app/wmppp/getmodemspeed.c b/wmppp.app/getmodemspeed.c similarity index 100% rename from wmppp.app/wmppp/getmodemspeed.c rename to wmppp.app/getmodemspeed.c diff --git a/wmppp.app/wmppp/system.wmppprc b/wmppp.app/system.wmppprc similarity index 100% rename from wmppp.app/wmppp/system.wmppprc rename to wmppp.app/system.wmppprc diff --git a/wmppp.app/wmppp/user.wmppprc b/wmppp.app/user.wmppprc similarity index 100% rename from wmppp.app/wmppp/user.wmppprc rename to wmppp.app/user.wmppprc diff --git a/wmppp.app/wmppp/wmppp-master.xpm b/wmppp.app/wmppp-master.xpm similarity index 100% rename from wmppp.app/wmppp/wmppp-master.xpm rename to wmppp.app/wmppp-master.xpm diff --git a/wmppp.app/wmppp/wmppp.1 b/wmppp.app/wmppp.1 similarity index 100% rename from wmppp.app/wmppp/wmppp.1 rename to wmppp.app/wmppp.1 diff --git a/wmppp.app/wmppp/wmppp.c b/wmppp.app/wmppp.c similarity index 99% rename from wmppp.app/wmppp/wmppp.c rename to wmppp.app/wmppp.c index 97d386f..cd86f25 100644 --- a/wmppp.app/wmppp/wmppp.c +++ b/wmppp.app/wmppp.c @@ -178,8 +178,8 @@ #include #include -#include "../wmgeneral/wmgeneral.h" -#include "../wmgeneral/misc.h" +#include "wmgeneral/wmgeneral.h" +#include "wmgeneral/misc.h" #include "wmppp-master.xpm"