Skip to content

Commit 37c410e

Browse files
waywardmonkeyswaywardmonkeys
authored
X*.h headers weren't cleaned up after renaming and merging. (#112)
* Check.h, Stipple.h, XCursors.h, XWaitCur.h, Xcursdef.h, Xdefcur.h, and Xicon.h were combined into xbitmaps.h. * Xdisplay.h is not used and the contents are in MyWindow.h, which is used. * XVersion.h and Xdeflt.h became xdefs.h. Remove 2 stragglers that were still including XVersion.h.
1 parent b901038 commit 37c410e

File tree

13 files changed

+32
-717
lines changed

13 files changed

+32
-717
lines changed

‎bin/makefile-tail‎

Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -824,80 +824,80 @@ $(OBJECTDIR)xinit.o : $(SRCDIR)xinit.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \
824824
$(INCDIR)adr68k.h
825825
$(CC) $(RFLAGS) $(SRCDIR)xinit.c -o $(OBJECTDIR)xinit$(OEXT)
826826

827-
$(OBJECTDIR)XClose.o : $(SRCDIR)XClose.c $(REQUIRED-INCS) $(INCDIR)XVersion.h \
827+
$(OBJECTDIR)XClose.o : $(SRCDIR)XClose.c $(REQUIRED-INCS) $(INCDIR)xdefs.h \
828828
$(INCDIR)MyWindow.h
829829
$(CC) $(RFLAGS) $(SRCDIR)XClose.c -o $(OBJECTDIR)XClose$(OEXT)
830830

831-
$(OBJECTDIR)Cursor.o : $(SRCDIR)Cursor.c $(REQUIRED-INCS) $(INCDIR)XVersion.h $(INCDIR)MyWindow.h \
831+
$(OBJECTDIR)Cursor.o : $(SRCDIR)Cursor.c $(REQUIRED-INCS) $(INCDIR)xdefs.h $(INCDIR)MyWindow.h \
832832
$(INCDIR)lispemul.h $(INCDIR)display.h
833833
$(CC) $(RFLAGS) $(SRCDIR)Cursor.c -o $(OBJECTDIR)Cursor$(OEXT)
834834

835-
$(OBJECTDIR)XWindow.o : $(SRCDIR)XWindow.c $(REQUIRED-INCS) $(INCDIR)XVersion.h \
835+
$(OBJECTDIR)XWindow.o : $(SRCDIR)XWindow.c $(REQUIRED-INCS) $(INCDIR)xdefs.h \
836836
$(INCDIR)MyWindow.h $(INCDIR)lispemul.h $(INCDIR)address.h \
837837
$(INCDIR)adr68k.h
838838
$(CC) $(RFLAGS) $(SRCDIR)XWindow.c -o $(OBJECTDIR)XWindow$(OEXT)
839839

840840
$(OBJECTDIR)DoRing.o : $(SRCDIR)DoRing.c $(REQUIRED-INCS) $(INCDIR)lispemul.h
841841
$(CC) $(RFLAGS) $(SRCDIR)DoRing.c -o $(OBJECTDIR)DoRing$(OEXT)
842842

843-
$(OBJECTDIR)DoScroll.o : $(SRCDIR)DoScroll.c $(REQUIRED-INCS) $(INCDIR)XVersion.h \
843+
$(OBJECTDIR)DoScroll.o : $(SRCDIR)DoScroll.c $(REQUIRED-INCS) $(INCDIR)xdefs.h \
844844
$(INCDIR)MyWindow.h $(INCDIR)Xbitblt.h
845845
$(CC) $(RFLAGS) $(SRCDIR)DoScroll.c -o $(OBJECTDIR)DoScroll$(OEXT)
846846

847-
$(OBJECTDIR)XEvent.o : $(SRCDIR)XEvent.c $(REQUIRED-INCS) $(INCDIR)XVersion.h \
847+
$(OBJECTDIR)XEvent.o : $(SRCDIR)XEvent.c $(REQUIRED-INCS) $(INCDIR)xdefs.h \
848848
$(INCDIR)MyWindow.h $(INCDIR)Xbitblt.h
849849
$(CC) $(RFLAGS) $(SRCDIR)XEvent.c -o $(OBJECTDIR)XEvent$(OEXT)
850850

851-
$(OBJECTDIR)XGravity.o : $(SRCDIR)XGravity.c $(REQUIRED-INCS) $(INCDIR)XVersion.h \
851+
$(OBJECTDIR)XGravity.o : $(SRCDIR)XGravity.c $(REQUIRED-INCS) $(INCDIR)xdefs.h \
852852
$(INCDIR)MyWindow.h
853853
$(CC) $(RFLAGS) $(SRCDIR)XGravity.c -o $(OBJECTDIR)XGravity$(OEXT)
854854

855855
$(OBJECTDIR)XInit.o : $(SRCDIR)XInit.c $(REQUIRED-INCS)
856856
$(CC) $(RFLAGS) $(SRCDIR)XInit.c -o $(OBJECTDIR)XInit$(OEXT)
857857

858-
$(OBJECTDIR)Xevinit.o : $(SRCDIR)Xevinit.c $(REQUIRED-INCS) $(INCDIR)XVersion.h \
858+
$(OBJECTDIR)Xevinit.o : $(SRCDIR)Xevinit.c $(REQUIRED-INCS) $(INCDIR)xdefs.h \
859859
$(INCDIR)MyWindow.h
860860
$(CC) $(RFLAGS) $(SRCDIR)Xevinit.c -o $(OBJECTDIR)Xevinit$(OEXT)
861861

862862
$(OBJECTDIR)Xkbdmus.o : $(SRCDIR)Xkbdmus.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \
863-
$(INCDIR)XVersion.h $(INCDIR)MyWindow.h $(INCDIR)dbprint.h
863+
$(INCDIR)xdefs.h $(INCDIR)MyWindow.h $(INCDIR)dbprint.h
864864
$(CC) $(RFLAGS) $(SRCDIR)Xkbdmus.c -o $(OBJECTDIR)Xkbdmus$(OEXT)
865865

866-
$(OBJECTDIR)Xlspwin.o : $(SRCDIR)Xlspwin.c $(REQUIRED-INCS) $(INCDIR)XVersion.h \
866+
$(OBJECTDIR)Xlspwin.o : $(SRCDIR)Xlspwin.c $(REQUIRED-INCS) $(INCDIR)xdefs.h \
867867
$(INCDIR)MyWindow.h $(INCDIR)Xdeflt.h
868868
$(CC) $(RFLAGS) $(SRCDIR)Xlspwin.c -o $(OBJECTDIR)Xlspwin$(OEXT)
869869

870-
$(OBJECTDIR)xlspwin.o : $(SRCDIR)xlspwin.c $(REQUIRED-INCS) $(INCDIR)XVersion.h \
870+
$(OBJECTDIR)xlspwin.o : $(SRCDIR)xlspwin.c $(REQUIRED-INCS) $(INCDIR)xdefs.h \
871871
$(INCDIR)MyWindow.h $(INCDIR)xdefs.h
872872
$(CC) $(RFLAGS) $(SRCDIR)xlspwin.c -o $(OBJECTDIR)xlspwin$(OEXT)
873873

874-
$(OBJECTDIR)Xbbt.o : $(SRCDIR)Xbbt.c $(REQUIRED-INCS) $(INCDIR)XVersion.h \
874+
$(OBJECTDIR)Xbbt.o : $(SRCDIR)Xbbt.c $(REQUIRED-INCS) $(INCDIR)xdefs.h \
875875
$(INCDIR)MyWindow.h
876876
$(CC) $(RFLAGS) $(SRCDIR)Xbbt.c -o $(OBJECTDIR)Xbbt$(OEXT)
877877

878-
$(OBJECTDIR)xbbt.o : $(SRCDIR)xbbt.c $(REQUIRED-INCS) $(INCDIR)XVersion.h \
878+
$(OBJECTDIR)xbbt.o : $(SRCDIR)xbbt.c $(REQUIRED-INCS) $(INCDIR)xdefs.h \
879879
$(INCDIR)MyWindow.h
880880
$(CC) $(RFLAGS) $(SRCDIR)xbbt.c -o $(OBJECTDIR)xbbt$(OEXT)
881881

882882
$(OBJECTDIR)LispXdisplay.o : $(SRCDIR)LispXdisplay.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \
883883
$(INCDIR)address.h $(INCDIR)adr68k.h $(INCDIR)pilotbbt.h \
884-
$(INCDIR)XVersion.h $(INCDIR)MyWindow.h $(INCDIR)Xbitblt.h
884+
$(INCDIR)xdefs.h $(INCDIR)MyWindow.h $(INCDIR)Xbitblt.h
885885
$(CC) $(RFLAGS) $(SRCDIR)LispXdisplay.c -o $(OBJECTDIR)LispXdisplay$(OEXT)
886886

887-
$(OBJECTDIR)Xkbd.o : $(SRCDIR)Xkbd.c $(REQUIRED-INCS) $(INCDIR)XVersion.h \
887+
$(OBJECTDIR)Xkbd.o : $(SRCDIR)Xkbd.c $(REQUIRED-INCS) $(INCDIR)xdefs.h \
888888
$(INCDIR)MyWindow.h
889889
$(CC) $(RFLAGS) $(SRCDIR)Xkbd.c -o $(OBJECTDIR)Xkbd$(OEXT)
890890

891-
$(OBJECTDIR)Xmkicon.o : $(SRCDIR)Xmkicon.c $(REQUIRED-INCS) $(INCDIR)XVersion.h \
892-
$(INCDIR)MyWindow.h $(INCDIR)Xicon.h
891+
$(OBJECTDIR)Xmkicon.o : $(SRCDIR)Xmkicon.c $(REQUIRED-INCS) $(INCDIR)xdefs.h \
892+
$(INCDIR)MyWindow.h $(INCDIR)xbitmaps.h
893893
$(CC) $(RFLAGS) $(SRCDIR)Xmkicon.c -o $(OBJECTDIR)Xmkicon$(OEXT)
894894

895-
$(OBJECTDIR)xmkicon.o : $(SRCDIR)xmkicon.c $(REQUIRED-INCS) $(INCDIR)XVersion.h \
896-
$(INCDIR)MyWindow.h $(INCDIR)Xicon.h
895+
$(OBJECTDIR)xmkicon.o : $(SRCDIR)xmkicon.c $(REQUIRED-INCS) $(INCDIR)xdefs.h \
896+
$(INCDIR)MyWindow.h $(INCDIR)xbitmaps.h
897897
$(CC) $(RFLAGS) $(SRCDIR)xmkicon.c -o $(OBJECTDIR)xmkicon$(OEXT)
898898

899899
$(OBJECTDIR)Xopendsp.o : $(SRCDIR)Xopendsp.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \
900-
$(INCDIR)XVersion.h $(INCDIR)MyWindow.h
900+
$(INCDIR)xdefs.h $(INCDIR)MyWindow.h
901901
$(CC) $(RFLAGS) $(SRCDIR)Xopendsp.c -o $(OBJECTDIR)Xopendsp$(OEXT)
902902

903903
$(OBJECTDIR)Xrdopt.o : $(SRCDIR)Xrdopt.c $(REQUIRED-INCS) $(INCDIR)Xdeflt.h
@@ -907,48 +907,46 @@ $(OBJECTDIR)xrdopt.o : $(SRCDIR)xrdopt.c $(REQUIRED-INCS) $(INCDIR)xdefs.h
907907
$(CC) $(RFLAGS) $(SRCDIR)xrdopt.c -o $(OBJECTDIR)xrdopt$(OEXT)
908908

909909
$(OBJECTDIR)Xreconf.o : $(SRCDIR)Xreconf.c $(REQUIRED-INCS) \
910-
$(INCDIR)XVersion.h $(INCDIR)MyWindow.h
910+
$(INCDIR)xdefs.h $(INCDIR)MyWindow.h
911911
$(CC) $(RFLAGS) $(SRCDIR)Xreconf.c -o $(OBJECTDIR)Xreconf$(OEXT)
912912

913-
$(OBJECTDIR)XScroll.o : $(SRCDIR)XScroll.c $(REQUIRED-INCS) $(INCDIR)XVersion.h \
914-
$(INCDIR)MyWindow.h $(INCDIR)Stipple.h $(INCDIR)Xcursdef.h \
915-
$(INCDIR)XCursors.h
913+
$(OBJECTDIR)XScroll.o : $(SRCDIR)XScroll.c $(REQUIRED-INCS) $(INCDIR)xdefs.h \
914+
$(INCDIR)MyWindow.h $(INCDIR)xbitmaps.h
916915
$(CC) $(RFLAGS) $(SRCDIR)XScroll.c -o $(OBJECTDIR)XScroll$(OEXT)
917916

918-
$(OBJECTDIR)xscroll.o : $(SRCDIR)xscroll.c $(REQUIRED-INCS) $(INCDIR)XVersion.h \
919-
$(INCDIR)MyWindow.h $(INCDIR)Stipple.h $(INCDIR)Xcursdef.h \
920-
$(INCDIR)XCursors.h
917+
$(OBJECTDIR)xscroll.o : $(SRCDIR)xscroll.c $(REQUIRED-INCS) $(INCDIR)xdefs.h \
918+
$(INCDIR)MyWindow.h $(INCDIR)xbitmaps.h
921919
$(CC) $(RFLAGS) $(SRCDIR)xscroll.c -o $(OBJECTDIR)xscroll$(OEXT)
922920

923-
$(OBJECTDIR)Xscrolb.o : $(SRCDIR)Xscrolb.c $(REQUIRED-INCS) $(INCDIR)XVersion.h \
921+
$(OBJECTDIR)Xscrolb.o : $(SRCDIR)Xscrolb.c $(REQUIRED-INCS) $(INCDIR)xdefs.h \
924922
$(INCDIR)MyWindow.h
925923
$(CC) $(RFLAGS) $(SRCDIR)Xscrolb.c -o $(OBJECTDIR)Xscrolb$(OEXT)
926924

927925
$(OBJECTDIR)XCursor.o : $(SRCDIR)XCursor.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \
928-
$(INCDIR)iopage.h $(INCDIR)XVersion.h $(INCDIR)MyWindow.h
926+
$(INCDIR)iopage.h $(INCDIR)xdefs.h $(INCDIR)MyWindow.h
929927
$(CC) $(RFLAGS) $(SRCDIR)XCursor.c -o $(OBJECTDIR)XCursor$(OEXT)
930928

931929
$(OBJECTDIR)xcursor.o : $(SRCDIR)xcursor.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \
932-
$(INCDIR)iopage.h $(INCDIR)XVersion.h $(INCDIR)MyWindow.h
930+
$(INCDIR)iopage.h $(INCDIR)xdefs.h $(INCDIR)MyWindow.h
933931
$(CC) $(RFLAGS) $(SRCDIR)xcursor.c -o $(OBJECTDIR)xcursor$(OEXT)
934932

935933
$(OBJECTDIR)XMouse.o : $(SRCDIR)XMouse.c $(REQUIRED-INCS) \
936-
$(INCDIR)XVersion.h $(INCDIR)MyWindow.h
934+
$(INCDIR)xdefs.h $(INCDIR)MyWindow.h
937935
$(CC) $(RFLAGS) $(SRCDIR)XMouse.c -o $(OBJECTDIR)XMouse$(OEXT)
938936

939-
$(OBJECTDIR)Xsubwin.o : $(SRCDIR)Xsubwin.c $(REQUIRED-INCS) $(INCDIR)XVersion.h \
937+
$(OBJECTDIR)Xsubwin.o : $(SRCDIR)Xsubwin.c $(REQUIRED-INCS) $(INCDIR)xdefs.h \
940938
$(INCDIR)MyWindow.h
941939
$(CC) $(RFLAGS) $(SRCDIR)Xsubwin.c -o $(OBJECTDIR)Xsubwin$(OEXT)
942940

943-
$(OBJECTDIR)Xcolor.o : $(SRCDIR)Xcolor.c $(REQUIRED-INCS) $(INCDIR)XVersion.h \
941+
$(OBJECTDIR)Xcolor.o : $(SRCDIR)Xcolor.c $(REQUIRED-INCS) $(INCDIR)xdefs.h \
944942
$(INCDIR)MyWindow.h
945943
$(CC) $(RFLAGS) $(SRCDIR)Xcolor.c -o $(OBJECTDIR)Xcolor$(OEXT)
946944

947-
$(OBJECTDIR)Xwinman.o : $(SRCDIR)Xwinman.c $(REQUIRED-INCS) $(INCDIR)XVersion.h \
945+
$(OBJECTDIR)Xwinman.o : $(SRCDIR)Xwinman.c $(REQUIRED-INCS) $(INCDIR)xdefs.h \
948946
$(INCDIR)MyWindow.h $(INCDIR)dbprint.h
949947
$(CC) $(RFLAGS) $(SRCDIR)Xwinman.c -o $(OBJECTDIR)Xwinman$(OEXT)
950948

951-
$(OBJECTDIR)xwinman.o : $(SRCDIR)xwinman.c $(REQUIRED-INCS) $(INCDIR)XVersion.h \
949+
$(OBJECTDIR)xwinman.o : $(SRCDIR)xwinman.c $(REQUIRED-INCS) $(INCDIR)xdefs.h \
952950
$(INCDIR)MyWindow.h $(INCDIR)dbprint.h
953951
$(CC) $(RFLAGS) $(SRCDIR)xwinman.c -o $(OBJECTDIR)xwinman$(OEXT)
954952

‎inc/Check.h‎

Lines changed: 0 additions & 59 deletions
This file was deleted.

‎inc/Stipple.h‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)