mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-28 07:43:55 +01:00
proj.mk, proj.mk.in: Replace proj.mk.in by proj.mk
This commit is contained in:
parent
fa81b0df6f
commit
0eb47e9605
1 changed files with 5 additions and 19 deletions
|
|
@ -24,9 +24,9 @@ REQUIRED = inst/pre \
|
||||||
lib include bin \
|
lib include bin \
|
||||||
inst/post
|
inst/post
|
||||||
|
|
||||||
VERSION = @PACKAGE_VERSION@
|
#VERSION = @PACKAGE_VERSION@
|
||||||
VERSION_STR = \"@PACKAGE_VERSION@\"
|
#VERSION_STR = \"@PACKAGE_VERSION@\"
|
||||||
DEVELOPMENT = @IS_DEVELOPMENT_VERSION@
|
#DEVELOPMENT = @IS_DEVELOPMENT_VERSION@
|
||||||
|
|
||||||
# rpmdist.mk variables
|
# rpmdist.mk variables
|
||||||
MKSPEC_SH = $(MOD_SCRIPT_DIR)/mkspec_wrapper.sh $(TOPDIR)/make/mkspec.sh
|
MKSPEC_SH = $(MOD_SCRIPT_DIR)/mkspec_wrapper.sh $(TOPDIR)/make/mkspec.sh
|
||||||
|
|
@ -53,22 +53,8 @@ LDFLAGS += -lytools
|
||||||
CFLAGS += -D_USRDLL -DYTOOLS_EXPORTS
|
CFLAGS += -D_USRDLL -DYTOOLS_EXPORTS
|
||||||
CPPFLAGS += -D_USRDLL -DYTOOLS_EXPORTS
|
CPPFLAGS += -D_USRDLL -DYTOOLS_EXPORTS
|
||||||
|
|
||||||
ARCH = @ARCH@
|
|
||||||
|
|
||||||
LD_LIB_PATH=$(TOPDIR)/lib
|
|
||||||
|
|
||||||
PROJECT_CFLAGS += -gstabs+
|
PROJECT_CFLAGS += -gstabs+
|
||||||
PROJECT_CPPFLAGS += -gstabs+
|
PROJECT_CPPFLAGS += -gstabs+
|
||||||
|
|
||||||
ifneq ($(TARGET),mingw)
|
USE_GLIB = true
|
||||||
ifeq (@ARCH@,x86)
|
|
||||||
PROJECT_LDFLAGS += $(shell export PKG_CONFIG_PATH=/opt/gnome/lib/pkgconfig; pkg-config --libs glib-2.0)
|
|
||||||
else
|
|
||||||
ifeq (@ARCH@,x86_64)
|
|
||||||
PROJECT_LDFLAGS += $(shell export PKG_CONFIG_PATH=/opt/gnome/lib64/pkgconfig; pkg-config --libs glib-2.0)
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
PROJECT_LDFLAGS += -ldl -lpthread
|
|
||||||
else
|
|
||||||
PROJECT_LDFLAGS += -lglib-2.0
|
|
||||||
endif
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue