update Makefile for new ctypesgen version

OSGeo · Jun 17, 2021 · 8c93979 · 8c93979
1 parent 5fd582b
commit 8c93979
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/python/grass/ctypes/Makefile b/python/grass/ctypes/Makefile
@@ -61,8 +61,7 @@ ifneq ($(findstring darwin,$(ARCH)),)
 MAC_FLAGS  = "-D_Nullable="
 endif
 
-SED = sed
-CTYPESGEN = ./ctypesgen.py
+CTYPESGEN = ./run.py
 CTYPESFLAGS = --cpp "$(CC) -E $(CPPFLAGS) $(LFS_CFLAGS) $(MAC_FLAGS) $(EXTRA_CFLAGS) $(NLS_CFLAGS) $(DEFS) $(EXTRA_INC) $(INC) -D__GLIBC_HAVE_LONG_LONG"
 EXTRA_CLEAN_FILES := $(wildcard ctypesgencore/*.pyc) $(wildcard ctypesgencore/*/*.pyc)
 
@@ -76,8 +75,8 @@ PYDIR = $(ETC)/python
 GDIR = $(PYDIR)/grass
 DSTDIR = $(GDIR)/lib
 
-PYFILES  := $(patsubst %,$(DSTDIR)/%.py,$(MODULES) __init__ ctypes_preamble ctypes_loader)
-PYCFILES  := $(patsubst %,$(DSTDIR)/%.pyc,$(MODULES) __init__ ctypes_preamble ctypes_loader)
+PYFILES  := $(patsubst %,$(DSTDIR)/%.py,$(MODULES))
+PYCFILES  := $(patsubst %,$(DSTDIR)/%.pyc,$(MODULES))
 LPYFILES := $(patsubst %,$(OBJDIR)/%.py,$(MODULES))
 
 ifeq ($(strip $(GRASS_LIBRARY_TYPE)),shlib)
@@ -90,13 +89,10 @@ default:
 	exit 1
 endif
 
-$(DSTDIR)/__init__.py: __init__.py | $(DSTDIR)
-	$(INSTALL_DATA) $< $@
+# $(DSTDIR)/__init__.py: __init__.py | $(DSTDIR)
+# 	$(INSTALL_DATA) $< $@
 
 $(DSTDIR)/%.py: $(OBJDIR)/%.py | $(DSTDIR)
-	$(SED) -f fix.sed $< > $@
-
-$(DSTDIR)/ctypes_%.py: %.py | $(DSTDIR)
 	$(INSTALL_DATA) $< $@
 
 define module_rule