Changeset 41340 for trunk/Ohana/src/kapa2/Makefile

Timestamp:

Apr 16, 2020, 1:54:47 PM (6 years ago)

Author:

tdeboer

Message:

revert to working Ohana build

File:

• trunk/Ohana/src/kapa2/Makefile (modified) (4 diffs)

trunk/Ohana/src/kapa2/Makefile

@@ -23 +23 @@
 install: $(DESTBIN)/kapa
 
-PDF = \
-$(SRC)/PDFit.$(ARCH).o                  \
-$(SRC)/PDF_Frame.$(ARCH).o              \
-$(SRC)/PDF_Objects.$(ARCH).o            \
-$(SRC)/PDF_Labels.$(ARCH).o             \
-$(SRC)/PDF_Image.$(ARCH).o              \
-$(SRC)/PDF_Overlay.$(ARCH).o            \
-$(SRC)/PDF_Textlines.$(ARCH).o          \
-$(SRC)/PDF_Pixmap.$(ARCH).o             \
-$(SRC)/PDF_Alpha.$(ARCH).o              \
-$(SRC)/PDF_PrintUtils.$(ARCH).o 
-
-BDRAW = \
-$(SRC)/bDrawIt.$(ARCH).o                \
-$(SRC)/bDrawFrame.$(ARCH).o             \
-$(SRC)/bDrawObjects.$(ARCH).o           \
-$(SRC)/bDrawLabels.$(ARCH).o            \
-$(SRC)/bDrawImage.$(ARCH).o             \
-$(SRC)/bDrawOverlay.$(ARCH).o 
-
-PSFILES = \
-$(SRC)/PSit.$(ARCH).o                   \
-$(SRC)/PSFrame.$(ARCH).o                \
-$(SRC)/PSObjects.$(ARCH).o              \
-$(SRC)/PSLabels.$(ARCH).o               \
-$(SRC)/PSimage.$(ARCH).o                \
-$(SRC)/PSOverlay.$(ARCH).o              \
-$(SRC)/PSTextlines.$(ARCH).o            \
-$(SRC)/PSPixmap.$(ARCH).o
-
 KAPA = \
 $(SRC)/kapa.$(ARCH).o                     $(SRC)/args.$(ARCH).o               \
@@ -68 +38 @@
 $(SRC)/DrawObjects.$(ARCH).o              $(SRC)/DrawFrame.$(ARCH).o          \
 $(SRC)/DrawTextlines.$(ARCH).o            $(SRC)/DrawLabels.$(ARCH).o         \
-$(SRC)/MemoryDump.$(ARCH).o           \
+$(SRC)/PSObjects.$(ARCH).o                $(SRC)/PSFrame.$(ARCH).o            \
+$(SRC)/PSLabels.$(ARCH).o                 $(SRC)/PSTextlines.$(ARCH).o        \
+$(SRC)/bDrawObjects.$(ARCH).o             $(SRC)/bDrawFrame.$(ARCH).o         \
+$(SRC)/bDrawLabels.$(ARCH).o              $(SRC)/bDrawIt.$(ARCH).o            \
+$(SRC)/bDrawImage.$(ARCH).o               \
 $(SRC)/PNGit.$(ARCH).o                    $(SRC)/PPMit.$(ARCH).o              \
+$(SRC)/PSit.$(ARCH).o                     $(SRC)/CrossHairs.$(ARCH).o         \
 $(SRC)/CheckPipe.$(ARCH).o                $(SRC)/EventLoop.$(ARCH).o          \
 $(SRC)/Reconfig.$(ARCH).o                 $(SRC)/Refresh.$(ARCH).o            \
@@ -77 +52 @@
 $(SRC)/ErasePlots.$(ARCH).o               $(SRC)/EraseImage.$(ARCH).o         \
 $(SRC)/EraseCurrentPlot.$(ARCH).o         $(SRC)/EraseSections.$(ARCH).o      \
-$(SRC)/SetToolbox.$(ARCH).o               $(SRC)/CrossHairs.$(ARCH).o         \
+$(SRC)/SetToolbox.$(ARCH).o                                                   \
 $(SRC)/SetSection.$(ARCH).o               $(SRC)/DefineSection.$(ARCH).o      \
 $(SRC)/SetLimits.$(ARCH).o                $(SRC)/SetFont.$(ARCH).o            \
@@ -100 +75 @@
 $(SRC)/CheckButtons.$(ARCH).o             $(SRC)/InvertButton.$(ARCH).o       \
 $(SRC)/UpdatePointer.$(ARCH).o            $(SRC)/JPEGit24.$(ARCH).o           \
-$(SRC)/ButtonFunctions.$(ARCH).o    \
-$(SRC)/SetChannel.$(ARCH).o         \
+$(SRC)/bDrawOverlay.$(ARCH).o             $(SRC)/ButtonFunctions.$(ARCH).o    \
+$(SRC)/PSimage.$(ARCH).o                  $(SRC)/PSPixmap.$(ARCH).o           \
+$(SRC)/PSOverlay.$(ARCH).o                $(SRC)/SetChannel.$(ARCH).o         \
 $(SRC)/SetColorScale.$(ARCH).o            $(SRC)/ColorCube.$(ARCH).o          \
 $(SRC)/ColorHistogram.$(ARCH).o           $(SRC)/CreateWide.$(ARCH).o
 
-OBJ  =  $(KAPA) $(PDF) $(BDRAW) $(PSFILES)
+OBJ  =  $(KAPA)
 
 # dependancy rules for include files ########################