Sharewarendectomy

Consensus that the "shareware" target was no longer necessary was
reached long ago[1]. It just needs to actually get done. Thus:

Makefile:
- remove shareware targets

buildcfg.txt, textures/combined.txt:
- remove #ifdef/#ifndef SHAREWARE sections (almost entirely #ifndef)

graphics/help2.gif:
- remove symlink, help2 screen was shareware-only

gitignore:
- remove shareware files no longer built

textures/shareware:
- remove directory

--
[1] http://www.doomworld.com/vb/freedoom/52758-removing-shareware/ .

In particular, Jon wrote:
>The original purpose of the shareware IWAD was to have a smaller set of
>resources to target 100% completion of. That was probably met a long
>time ago.

More recently chungy wrote in <http://www.doomworld.com/vb/post/957707>
>Removing the "demo"/"shareware" version of Freedoom has been discussed
>but it's never been done. Actually it's a bit easier to just leave it
>in than to remove it. (It'd be pretty easy to get rid of it anyway, but
>nothing is really gained from it)

Signed-off-by: RjY <rjy@users.sourceforge.net>

.gitignore

@@ -14,8 +14,6 @@ textures/doom2/pnames.txt
 textures/doom2/texture1.txt
 textures/freedm/pnames.txt
 textures/freedm/texture1.txt
-textures/shareware/pnames.txt
-textures/shareware/texture1.txt
 textures/texture1.txt
 wads/*.wad
 wad*.txt

Makefile

@@ -38,7 +38,6 @@ OBJS = \
 	$(WADS)/freedoom_sprites.wad  \
 	$(WADS)/freedoom_sounds.wad   \
 	$(WADS)/freedoom_textures.wad \
-	$(WADS)/doom1.wad	          \
 	$(WADS)/doom2.wad             \
 	$(WADS)/doom.wad	      \
 	$(WADS)/freedm.wad
@@ -62,11 +61,7 @@ textures/doom/texture1.txt: textures/combined.txt
 	$(CPP) -DDOOM1 -DULTDOOM < $< > $@
 textures/freedm/texture1.txt: textures/combined.txt
 	$(CPP) -DFREEDM < $< > $@
-textures/shareware/texture1.txt: textures/combined.txt
-	$(CPP) -DSHAREWARE < $< > $@
 
-textures/shareware/pnames.txt: textures/shareware/texture1.txt
-	scripts/extract-pnames.py < $< > $@
 textures/doom/pnames.txt: textures/doom/texture1.txt
 	scripts/extract-pnames.py -a > $@
 textures/doom2/pnames.txt: textures/doom2/texture1.txt 
@@ -78,8 +73,6 @@ textures/freedm/pnames.txt: textures/freedm/texture1.txt
 
 wadinfo.txt: buildcfg.txt force textures/doom2/pnames.txt
 	$(CPP) -P -DDOOM2 < $< | scripts/wadinfo-builder.py > $@
-wadinfo_sw.txt: buildcfg.txt force textures/shareware/pnames.txt
-	$(CPP) -P -DSHAREWARE < $< | scripts/wadinfo-builder.py -dummy > $@
 wadinfo_iwad.txt: buildcfg.txt force textures/doom2/pnames.txt
 	$(CPP) -P -DDOOM2 < $< | scripts/wadinfo-builder.py -dummy > $@
 wadinfo_ult.txt: buildcfg.txt force textures/doom/pnames.txt
@@ -93,6 +86,10 @@ wadinfo_freedm.txt : buildcfg.txt force textures/freedm/pnames.txt
 	md5sum $<.gz > $<.md5sum
 	rm -f $<
 
+# deutex doesnt allow redirects for the filenames in the texture
+# entries, so we have to change the texture1 symlink to point
+# to whichever wad we are working on
+
 #---------------------------------------------------------
 # build wad
 
@@ -154,17 +151,7 @@ $(WADS)/freedoom_sounds.wad : wadinfo.txt force
 	rm -f $@
 	$(DEUTEX) $(DEUTEX_ARGS) -sounds -musics -build wadinfo.txt $@
 
-#---------------------------------------------------------
-# shareware iwad
-# 
-# deutex doesnt allow redirects for the filenames in the texture
-# entries, so we have to change the texture1 symlink to point
-# to the shareware wad
 
-$(WADS)/doom1.wad : wadinfo_sw.txt force
-	ln -sf shareware/texture1.txt textures/texture1.txt
-	rm -f $@
-	$(DEUTEX) $(DEUTEX_ARGS) -iwad -build wadinfo_sw.txt $@
 
 dist : $(OBJS)
 	scripts/makepkgs $(OBJS)
@@ -186,8 +173,6 @@ clean:
 		./textures/doom2/texture1.txt \
 		./textures/freedm/pnames.txt \
 		./textures/freedm/texture1.txt \
-		./textures/shareware/pnames.txt \
-		./textures/shareware/texture1.txt \
 		./textures/texture1.txt
 
 	make -C lumps clean

buildcfg.txt

@@ -43,16 +43,10 @@
 
 #ifdef DOOM2
 #define ULTDOOM_OR_DOOM2
-#undef SHAREWARE
 #undef ULTDOOM
 #endif
 
-#ifdef SHAREWARE
-#define DOOM1
-#endif
-
 #ifdef ULTDOOM
-#undef SHAREWARE
 #define ULTDOOM_OR_DOOM2
 #endif
 
@@ -69,8 +63,6 @@ E1M6
 E1M7
 E1M8
 E1M9
-
-#ifndef SHAREWARE
 E2M1
 E2M2
 E2M3
@@ -102,8 +94,6 @@ E4M8
 E4M9
 #endif /* #ifdef ULTDOOM */
 
-#endif /* #ifndef SHAREWARE */
-
 #else /* #ifndef DOOM2 */
 
 #ifdef FREEDM
@@ -288,8 +278,6 @@ DSBDOPN
 DSBDCLS
 DSITMBK
 DSGETPOW
-
-#ifndef SHAREWARE
 DSPLASMA
 DSBFG
 DSCACSIT
@@ -302,7 +290,6 @@ DSCYBDTH
 DSSPIDTH
 DSHOOF
 DSMETAL
-#endif /* #ifndef SHAREWARE */
 
 #ifdef DOOM2
 DSDSHTGN
@@ -404,8 +391,6 @@ DPBDOPN
 DPBDCLS
 DPITMBK
 DPGETPOW
-
-#ifndef SHAREWARE
 DPPLASMA
 DPBFG
 DPCACSIT
@@ -416,7 +401,6 @@ DPCACDTH
 DPSKLDTH
 DPCYBDTH
 DPSPIDTH
-#endif /* #ifndef SHAREWARE */
 
 #ifdef DOOM2
 DPHOOF
@@ -484,7 +468,6 @@ D_INTRO
 D_VICTOR
 D_INTROA
 
-#ifndef SHAREWARE 
 D_E2M1
 D_E2M2
 D_E2M3
@@ -507,8 +490,6 @@ D_E3M9
 
 D_BUNNY
 
-#endif /* #ifndef SHAREWARE */
-
 #else	/* #ifndef DOOM2 */
 
 ; doom 2 music
@@ -569,9 +550,6 @@ HELP	0	0
 #endif
 #ifndef DOOM2
 HELP1	0	0
-#ifdef SHAREWARE
-HELP2	0	0
-#endif
 #endif
 
 CREDIT	0	0
@@ -847,8 +825,6 @@ WILV05  0       0
 WILV06  0       0
 WILV07  0       0
 WILV08  0       0
-
-#ifndef SHAREWARE
 WILV10	0	0
 WILV11  0       0
 WILV12  0       0
@@ -884,8 +860,6 @@ PFUB2	0	0
 ENDPIC	0	0
 #endif
 
-#endif /* #ifndef SHAREWARE */
-
 ; inter level map
 
 WIURH0
@@ -924,7 +898,6 @@ WIA00000        0       0
 WIA00001        0       0
 WIA00002        0       0
 
-#ifndef SHAREWARE 
 WIMAP1		0	0
 WIA10000        0       0
 WIA10100        0       0
@@ -956,7 +929,6 @@ WIA20402        0       0
 WIA20500        0       0
 WIA20501        0       0
 WIA20502        0       0
-#endif /* #ifndef SHAREWARE */
 
 #else /* #ifndef DOOM2 */
 
@@ -2176,11 +2148,6 @@ TROOR0	32	32
 TROOS0	32	32
 TROOT0	32	32
 TROOU0	32	32
-
-#ifndef SHAREWARE
-
-; These monsters are not in shareware 
-
 CYBRA1	58	117	; cyberdemon
 CYBRA2	58	117
 CYBRA3	58	117
@@ -2403,8 +2370,6 @@ SPIDQ0	128	100
 SPIDR0	128	100
 SPIDS0	128	100
 
-#endif        /* #ifndef SHAREWARE */
-
 #endif        /* #ifdef FREEDM */
 
 ; These are normal items that appear in both Freedoom and FreeDM.
@@ -2607,8 +2572,6 @@ TREDD0	14	93
 YKEYA0	8	19
 YKEYB0	8	19
 
-; extra: these were not in original shareware but are now
-
 SMITA0	22	62
 TRE1A0	25	65
 TRE2A0	76	120
@@ -2651,10 +2614,6 @@ POB2A0
 
 #endif
 
-#ifndef SHAREWARE 
-
-; These items do not appear in shareware builds
-
 APBXA0	12	11
 APBXB0	19	18
 APBXC0	17	18
@@ -2761,14 +2720,10 @@ TGRND0	14	93
 YSKUA0	7	18
 YSKUB0	7	18
 
-#endif /* #ifndef SHAREWARE */
+
 
 [patches]
 
-#ifdef SHAREWARE
-#include "textures/shareware/pnames.txt"
-#endif
-
 #ifdef ULTDOOM
 #include "textures/doom/pnames.txt"
 #endif
@@ -2795,10 +2750,6 @@ DUMMY3
 
 #endif
 
-#ifndef SHAREWARE
-
-; these flats are not in shareware
-
 GRIDBLUE
 GRIDGRN
 GRIDPURP
@@ -2891,11 +2842,6 @@ SLIME13
 SLIME14
 SLIME15
 SLIME16
-
-#endif /* #ifndef SHAREWARE */
-
-; shareware flats
-
 CEIL3_1 
 CEIL3_2 
 CEIL3_5 
@@ -2951,10 +2897,6 @@ TLITE6_1
 TLITE6_4
 TLITE6_5
 TLITE6_6
-
-; extra flats
-; these are not in the original shareware wad
-
 CEIL1_1
 CEIL3_3
 CEIL4_1

graphics/help2.gif

@@ -1 +0,0 @@
-doomttl.gif

textures/combined.txt

@@ -29,18 +29,9 @@
 #endif
 
 #ifdef DOOM2
-#undef SHAREWARE
 #undef ULTDOOM
 #endif
 
-#ifdef SHAREWARE
-#define DOOM1
-#endif
-
-#ifdef ULTDOOM
-#undef SHAREWARE
-#endif
-
 ;Format of textures:
 ;TextureName	Width	Height
 ;*	PatchName	Xoffset	Yoffset
@@ -79,10 +70,6 @@ GLASS1                  64      96
 
 
 
-#ifndef SHAREWARE
-
-; these textures are in doom1 but not in the shareware build
-
 BLODGR1     		32	128
 *	TP5_1       	0	0
 BLODGR2     		32	128
@@ -164,8 +151,6 @@ SKULWALL    		128	128
 *	WALL79_1		-4	0
 *	WALL79_1		124	0
 
-#endif
-
 ASHWALL     		64	128
 *	W104_1      	0	0
 BRNBIGC     		128	128
@@ -1572,9 +1557,9 @@ ZZZFACE9    		256	128
 
 #endif
 
-#ifndef SHAREWARE
 
-; these textures are not in shareware
+
+
 BFALL      		64	128
 *	BFALL1      	0	0
 BFALL1      		64	128
@@ -1944,7 +1929,6 @@ WFALL3			64	128
 WFALL4			64	128
 *	WFALL4		0	0
 
-#endif
 
 
 #ifdef ULTDOOM