Index: apl/src/Makefile.am
===================================================================
--- apl.orig/src/Makefile.am
+++ apl/src/Makefile.am
@@ -37,7 +37,7 @@ common_CXXFLAGS += $(GTK_CFLAGS) $(GTK_L
 common_CXXFLAGS += $(PYTHON_CFLAGS)
 common_LDFLAGS  = -export-dynamic $(GTK_LDFLAGS)
 
-common_SOURCES  = $(plot_SOURCES) 
+common_SOURCES  = $(plot_SOURCES)
 common_SOURCES +=						../buildtag.hh
 common_SOURCES +=						../config.h
 common_SOURCES +=						APL_Float_as_class.hh
@@ -206,8 +206,8 @@ libapl_la_LDFLAGS += -avoid-version
 # libapl_la_LDFLAGS += -export-dynamic
 libapl_la_CXXFLAGS = $(common_CXXFLAGS)
 libapl_la_CXXFLAGS += $(GCOV_WANTED) $(GPROF_WANTED) $(CXX_RDYNAMIC)
+endif
 
-else
 if apl_TARGET_PYTHON
 
 pkglib_LTLIBRARIES += lib_gnu_apl.la
@@ -224,8 +224,7 @@ lib_gnu_apl_la_CXXFLAGS += -fstack-prote
 lib_gnu_apl_la_CXXFLAGS += --param=ssp-buffer-size=4
 lib_gnu_apl_la_CXXFLAGS += -I/usr/include/python3.6m   # server68
 lib_gnu_apl_la_CXXFLAGS += -I/usr/include/python3.8    # server58
-
-else
+endif
 
 bin_PROGRAMS = apl
 apl_SOURCES = main.cc $(common_SOURCES)
@@ -233,8 +232,6 @@ apl_CXXFLAGS = $(common_CXXFLAGS)
 apl_CXXFLAGS += $(GCOV_WANTED) $(GPROF_WANTED) $(CXX_RDYNAMIC)
 apl_LDFLAGS = $(common_LDFLAGS)
 
-endif
-endif
 
 # normally we would say:
 #