Skip to content

Commit

Permalink
code clean
Browse files Browse the repository at this point in the history
  • Loading branch information
KeithDHedger committed Sep 22, 2018
1 parent 830c44a commit 24316f0
Show file tree
Hide file tree
Showing 12 changed files with 216 additions and 894 deletions.
12 changes: 6 additions & 6 deletions Makefile.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@

# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.

# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
Expand Down Expand Up @@ -525,7 +525,7 @@ distdir: $(DISTFILES)
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
$(am__post_remove_distdir)

dist-bzip2: distdir
Expand All @@ -551,7 +551,7 @@ dist-shar: distdir
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
$(am__post_remove_distdir)

dist-zip: distdir
Expand All @@ -569,7 +569,7 @@ dist dist-all:
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
Expand All @@ -579,7 +579,7 @@ distcheck: dist
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
Expand Down
15 changes: 4 additions & 11 deletions XDecorations/app/Makefile.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@

# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.

# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
Expand Down Expand Up @@ -103,8 +103,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
PROGRAMS = $(bin_PROGRAMS)
am__dirstamp = $(am__leading_dot)dirstamp
am__objects_1 = ../src/draw.$(OBJEXT) ../src/globals.$(OBJEXT) \
../src/internet.$(OBJEXT) ../src/routines.$(OBJEXT) \
../src/startstop.$(OBJEXT) ../src/toon_root.$(OBJEXT) \
../src/routines.$(OBJEXT) ../src/startstop.$(OBJEXT) \
../src/update.$(OBJEXT) ../src/xdecorations.$(OBJEXT)
am_xdecorations_OBJECTS = $(am__objects_1)
xdecorations_OBJECTS = $(am_xdecorations_OBJECTS)
Expand Down Expand Up @@ -308,7 +307,7 @@ AM_CPPFLAGS = -I$(top_srcdir) \
$(IMLIB_CFLAGS) \
-DDATADIR=\""${pkgdatadir}/pixmaps"\"

COMMONSRC = ../src/draw.cpp ../src/globals.cpp ../src/internet.cpp ../src/routines.cpp ../src/startstop.cpp ../src/toon_root.cpp ../src/update.cpp ../src/xdecorations.cpp
COMMONSRC = ../src/draw.cpp ../src/globals.cpp ../src/routines.cpp ../src/startstop.cpp ../src/update.cpp ../src/xdecorations.cpp
xdecorations_SOURCES = $(COMMONSRC)
man1_MANS = ../resources/man/xdecorations.1
docfilesdir = $(pkgdatadir)/docs
Expand Down Expand Up @@ -399,14 +398,10 @@ clean-binPROGRAMS:
../src/$(DEPDIR)/$(am__dirstamp)
../src/globals.$(OBJEXT): ../src/$(am__dirstamp) \
../src/$(DEPDIR)/$(am__dirstamp)
../src/internet.$(OBJEXT): ../src/$(am__dirstamp) \
../src/$(DEPDIR)/$(am__dirstamp)
../src/routines.$(OBJEXT): ../src/$(am__dirstamp) \
../src/$(DEPDIR)/$(am__dirstamp)
../src/startstop.$(OBJEXT): ../src/$(am__dirstamp) \
../src/$(DEPDIR)/$(am__dirstamp)
../src/toon_root.$(OBJEXT): ../src/$(am__dirstamp) \
../src/$(DEPDIR)/$(am__dirstamp)
../src/update.$(OBJEXT): ../src/$(am__dirstamp) \
../src/$(DEPDIR)/$(am__dirstamp)
../src/xdecorations.$(OBJEXT): ../src/$(am__dirstamp) \
Expand All @@ -425,10 +420,8 @@ distclean-compile:

@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/draw.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/globals.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/internet.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/routines.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/startstop.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/toon_root.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/update.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/xdecorations.Po@am__quote@

Expand Down
2 changes: 1 addition & 1 deletion XDecorations/sources
Original file line number Diff line number Diff line change
@@ -1 +1 @@
COMMONSRC = ../src/draw.cpp ../src/globals.cpp ../src/internet.cpp ../src/routines.cpp ../src/startstop.cpp ../src/toon_root.cpp ../src/update.cpp ../src/xdecorations.cpp
COMMONSRC = ../src/draw.cpp ../src/globals.cpp ../src/routines.cpp ../src/startstop.cpp ../src/update.cpp ../src/xdecorations.cpp
2 changes: 1 addition & 1 deletion XDecorations/src/globals.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ int done=0;
long mainDelay;

uint runCounter=0;
bool useWindow=true;
//bool useWindow=true;
int offSetY=0;
bool watchConfig=false;
bool needsSwap=false;
Expand Down
6 changes: 4 additions & 2 deletions XDecorations/src/globals.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@
#include <ctype.h>

#include "config.h"
#include "internet.h"

#define MYEMAIL "[email protected]"
#define COPYRITE "©K.D.Hedger 2013-2018"

#define MAXPATHNAMELEN 4096
#define MAXNUMBEROFFLYERS 100
Expand Down Expand Up @@ -126,7 +128,7 @@ extern bool useWindow;
extern int offSetY;
extern bool watchConfig;
extern uint runCounter;
extern bool useWindow;
//extern bool useWindow;
extern int offSetY;
extern bool watchConfig;
extern bool needsSwap;
Expand Down
56 changes: 0 additions & 56 deletions XDecorations/src/internet.cpp

This file was deleted.

43 changes: 0 additions & 43 deletions XDecorations/src/internet.h

This file was deleted.

Loading

0 comments on commit 24316f0

Please sign in to comment.